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

Change-Id: I5492139231b12366efc95f757f5429f6bc54b347