Merge changes from topic "ka05" am: b3656c7b1b am: 14e51c8a84
am: 3dea854998

Change-Id: Ie56c431a6d934c752d1de30fc4bf98a7e557e5b2