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