[automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 -s ours am: 1f03fbdeed -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 0420e692a7 is in history
Change-Id: I7fa7ffe6918ba67994e6012530edc6fe2a75432f
This commit is contained in: