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

Change-Id: I08979872a03c52e933daa39730fd71e998272613