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

Change-Id: I8d7f5581dd59d46acb5109312e9ae98daf3b2d45