[automerger skipped] Merge changes I7fd7d98a,If770a615 into rvc-dev am: 266fba1670 am: 87193786f0 am: 949dadb4fe am: eb205eac81 -s ours
am skip reason: Change-Id I7fd7d98a03ecb1edb1b79475fadb944bc4f2fd6f with SHA-1 b28d2acc75 is in history
Change-Id: I76d47f6a18fbdc1bb521dcecba90a1a49d11a96d
This commit is contained in: