Kafka app changes merged

Change-Id: I1b075243e48853dc9011539c73ff1627a9ce3408
2 files changed