[automerger skipped] Merge changes Ifdf54ace,Ib2c1d16d into rvc-dev am:...
[automerger skipped] Merge changes Ifdf54ace,Ib2c1d16d into rvc-dev am: d1ec74f5 -s ours am: a75a4d5d -s ours
am skip reason: Change-Id Ifdf54ace6dcc05efc14c182018848880cfb0a00f with SHA-1 2a4deaf3 is in history
Change-Id: Ife9171d3ea24c62e2cd4e33a0685f56ebc61e2e7