[automerger skipped] Merge changes I7fd7d98a,If770a615 into rvc-dev am: 266fba1670 am: e214f93de4 -s ours
am skip reason: Change-Id I7fd7d98a03ecb1edb1b79475fadb944bc4f2fd6f with SHA-1 ac7bc339b2 is in history
Change-Id: Ifc47c15ad62cbaaf7042928d0f25d7c8193fd850
This commit is contained in: