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

Change-Id: Ie91e9628b69262c3676fc2595bfecbc37c9b8bae