Merge changes I3e8594f6,I2c6d40ee into rvc-dev am: 08327f1659 am: ae5b0f2974

Change-Id: I01690eba7be2abdac193923b5497164df6218e5d