[automerger skipped] Merge changes Ia233ca64,I2d0bc216,I94003873 into rvc-dev am: f8d52afa16 am: 855175408e am: ba7a92dc31 am: 396eba307b -s ours
am skip reason: Change-Id Ia233ca642d58b7b6a0984359ea11958f8d9a8ff8 with SHA-1 2f777b39b7 is in history
Change-Id: I53e965bbba6663b3130a01d952fb6c5f3bba1eea
This commit is contained in: