Merge changes from topic "add-km-41"
am: f66777ad50

Change-Id: I936540f9f9956a01c8c03fc1db6c54ffe81f3489