Merge changes I82cecd20,I2b4e41a4 into rvc-dev am: cbbc9c5c21 am: 0b80c491ae am: b057c6ec81 am: 9c165d3270

Change-Id: I6e03a644faa48ffcd53b3ba21aa90fa68fbb9e2b