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

Change-Id: Ib8d18916be1fcc5a62781fd2613cff67e87e9dc0