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

Change-Id: If6bb1472e38edff91af6dcc140f1dc49a25d6559