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

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

Change-Id: Iceb5c0313da524b6d88a9bb9c0579076f937b1d3