[automerger skipped] Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 333aa55f87 am: 2ad9603397 am: 74755c4332 -s ours
am skip reason: Change-Id Ief1cac1952302e43a2c57314bc1449fa7bf38ba7 with SHA-1 5e6a959653 is in history
Change-Id: I662546bad27ce854afeae08630ceb1505b777c22
This commit is contained in: