Merge changes from topic "ext" into rvc-dev am: e2a128a901 am: 2692deb29f am: 1b43a9e3e9

Change-Id: I20bd2a2b4886fc9db3f501f3d615d693554d1cc7