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

Change-Id: I2768485beb6cc6146c584e47821495da03ead7f5