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

Change-Id: I929d2702a8f1a19c2118596d2b626d4d86b253e5