[automerger skipped] Merge changes Ia233ca64,I2d0bc216,I94003873 into rvc-dev...
[automerger skipped] Merge changes Ia233ca64,I2d0bc216,I94003873 into rvc-dev am: f8d52afa am: 85517540 am: ba7a92dc am: 396eba30 -s ours
am skip reason: Change-Id Ia233ca642d58b7b6a0984359ea11958f8d9a8ff8 with SHA-1 2f777b39 is in history
Change-Id: I53e965bbba6663b3130a01d952fb6c5f3bba1eea