Merge changes from topic "ext" into rvc-dev am: e2a128a901 am: 68b2f26e4b am: 8e3dcfab28

Change-Id: I89e0e615af949c9d04ece5e61385a5a1a882cba3