[automerger skipped] Merge changes Ic0f71df7,Ib6635f00,Ia5d35c32,I9aeafa45 into rvc-dev am: 477e59f84a -s ours am: 74e588f02c -s ours am: 330545a111 -s ours

am skip reason: Change-Id Ic0f71df739bd9162653b5f2878e7ddc446ddde0e with SHA-1 3d95958d01 is in history

Change-Id: Idcb0d8f5fc0345c71e17a9eb4b6138832facc47c