Change-Id: I34f63aef2a473c475f3740e160f64e6c1ee758fc Partial-Bug: #1546944
Partially implements: blueprint heka Change-Id: I9e5ba649bc45356822138ad223430f4b93722448