[automerger skipped] Merge commit 'eae337cbff4e792cd0b428758ab7ba3d2474f688' into rvc-dev am: 4ee72ecf8d am: 22b573c949 am: 147d950fd9 -s ours

am skip reason: Change-Id I9b4c7ad6dce9d01698ab422d3a1c488107470816 with SHA-1 eae337cbff is in history

Change-Id: I013a57029d94700487b66456344180474ce43d9e