[automerger skipped] Merge changes Ia233ca64,I2d0bc216,I94003873 into rvc-dev am: f8d52afa16 am: 855175408e am: 9b26ccd89a -s ours
am skip reason: Change-Id Ia233ca642d58b7b6a0984359ea11958f8d9a8ff8 with SHA-1 298239b59e is in history
Change-Id: I23a9920828bcdec992778dbfba976387d454f65e
This commit is contained in: