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