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