Merge changes from topic "add-km-41" am: f66777ad50 am: 7f7e9608dc
am: 78926e3375

Change-Id: I7964555358e9150d58f53eb154ee7acf5eea1a78