[automerger skipped] Merge changes I97ba5903,Icd80b368 into rvc-dev am: d3d72d4452 -s ours am: 726396aab9 -s ours
am skip reason: Change-Id I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c with SHA-1 cbb19fcba7 is in history
Change-Id: I012b8d8da51b53361d0b278cc1d7fcc0f259e250
This commit is contained in: