Merge changes I9f44ed05,I8990bf48,Ib302cbc2 into rvc-dev am: bc838ca6 am: b371ea07 am: e3a640bb Change-Id: I3c3dac3529458304d7a7c776b8f996bb8801ae43