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