[automerger skipped] Merge changes I7fd7d98a,If770a615 into rvc-dev am: 266fba1670 am: e214f93de4 am: 0e294ad93f am: df19c3317a -s ours am: a417b48637 -s ours

am skip reason: Change-Id I7fd7d98a03ecb1edb1b79475fadb944bc4f2fd6f with SHA-1 ac7bc339b2 is in history

Change-Id: I4abd9c93f17298b6d462d4027b3c5e96b28bc385