[automerger skipped] Merge changes Ifdf54ace,Ib2c1d16d into rvc-dev am:...
[automerger skipped] Merge changes Ifdf54ace,Ib2c1d16d into rvc-dev am: d1ec74f5 am: 68288418 -s ours am: f8624631 -s ours
am skip reason: Change-Id Ifdf54ace6dcc05efc14c182018848880cfb0a00f with SHA-1 d0ab1505 is in history
Change-Id: I5c12f3c9fbdf38383ced142e666f1ec0d76ff7d8