Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: 0cd6d1cb70 -s ours am: d4cd49c306 -s ours" into rvc-d1-dev-plus-aosp am: 0d34274a6b -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 ad72d21a53 is in history
Change-Id: Ie3884e88a5e1b7e8997da346c7984a6bf02b186f
This commit is contained in: