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

Change-Id: I05b5d764ca3316b749d5d2f786f95abcb5c66845