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

Change-Id: Ieaf1ba207daf0cf35bc81380c1047ec587486e08