Change-Id: Iaa7049834be784c7410970fb9f0b25086891211d Partial-Bug: #1546944
Partially implements: blueprint heka Change-Id: I91a977c6a3632c570f7a6054c8de3f5e3cb6932c