[automerger skipped] Merge changes Ib3e80315,If19fb12c,Ic50d70f3 into rvc-dev am: 6742ce7ab1 -s ours am: f57f918660 -s ours
am skip reason: Change-Id Ib3e803159cdf42a8655c0e4d0f22faeabe161c4c with SHA-1 cb778b1200 is in history
Change-Id: If9a48cc472787c3c684cbf61ef21a22f1f88cfe7
This commit is contained in: