Change-Id: I32e55ce520c95b3d2c018604e925bd8d4fdf58f1 Partial-Bug: #1546944
Partially implements: blueprint heka Change-Id: I17fc4b838d6ba8b6fcfc5c08314fef5fac1c7aff