[automerger skipped] Merge changes I86cb5af0,I706e40db into rvc-dev am:...
[automerger skipped] Merge changes I86cb5af0,I706e40db into rvc-dev am: d8fa6685 am: 74e2c3c2 -s ours
am skip reason: Change-Id I86cb5af059fe81fe9f10555d57096164665205db with SHA-1 c9313a26 is in history
Change-Id: I49b15e419ac9c4f6e95e2a3fa029d895ed57c7c5