[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: d7aa055b61 -s ours am: bd38d29054 -s ours
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 4d3f871a94 is in history Change-Id: I439913a4195cea16832b3ec6c19a3cfaa63dfdb8
This commit is contained in: