Merge changes I04f5fe51,I6d5790b2 into rvc-dev am: cb322091b7

Change-Id: I06bcec3e6371c2497b34b136cc7d036399a31a0d