[automerger skipped] Merge changes I8075f647,I57905635 into rvc-dev am:...
[automerger skipped] Merge changes I8075f647,I57905635 into rvc-dev am: 010183d2 am: 9977847f am: b2eea12d am: 908e646c -s ours
am skip reason: Change-Id I3471a54eb1d8afb1d967797f9dfe923cd23c08d7 with SHA-1 c69898d2 is in history
Change-Id: I9664eea98a3877b79c8f9ef0c9553b0420aeec56