Merge "Merge changes Id3953904,I2ef286d6 into rvc-dev am: 94457298 am: a3b13ffc" into rvc-d1-dev-plus-aosp