Merge changes I3e8594f6,I2c6d40ee into rvc-dev am: 08327f1659 am: ae5b0f2974 am: 406ef6899e am: f6a9ac2d02 am: 0c455b5db1

Change-Id: Ib7ebffb2ef472235b72501c00ab28e3fc59b8f80