[automerger skipped] Merge changes Ie3669798,I4b34cc34 into rvc-dev am: 4ac0f0f3ae -s ours

am skip reason: Change-Id Ie366979880bfc3b7e95a02957451736d724f838f with SHA-1 892d147516 is in history

Change-Id: If1a3779c055fda31069eb7ee39dafd2b9f5e679b