Merge changes I1118f2e2,I6c039b32 into rvc-dev am: d4c8a20d4b

Change-Id: Ie2c0674fa02fdc433e49e97f699ba5545dd37379