[automerger skipped] Merge changes Ic0f71df7,Ib6635f00,Ia5d35c32,I9aeafa45 into rvc-dev am: 477e59f84a am: 71742ff0e2 -s ours am: 0dab9c0746 -s ours am: 3441452d12 -s ours

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

Change-Id: I541bcd90b97e307b4fc84c59e3cd32ab578cdb58