Merge changes I8d88c8fb,I35bf3768 into rvc-dev am: 1439b570f5 am: 4c6a367439 am: 394b471ef9 am: 08b7242110

Change-Id: Idf9f5a66cf7b6a1bc8f4faf9c386acc7dbd70365