Merge changes I8d88c8fb,I35bf3768 into rvc-dev am: 1439b570f5

Change-Id: I8ec37cfee23d180c71fb0b349dbe3282783b83f4