Merge changes I82cecd20,I2b4e41a4 into rvc-dev am: cbbc9c5c21

Change-Id: I8b2c5f6888c11df6eac755ffc8b9e54a13121321