Merge changes I3e8594f6,I2c6d40ee into rvc-dev am: 08327f16 am: ae5b0f29 am: 406ef689 am: f6a9ac2d am: 0c455b5d Change-Id: Ib7ebffb2ef472235b72501c00ab28e3fc59b8f80