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