Merge changes I97ba5903,Icd80b368 into rvc-dev am: 7df7129b am: 0a1afc6d am: 34417aaf am: 6e31fcc1 Change-Id: I23bd1b785a0b9920c9f2402d92e6b0c00362cf87