Merge changes I41959627,Iba316772 into rvc-dev am: 9a979fb217 am: d806110483 am: 71dfff2541

Change-Id: I6036e6a00594163579467819cf4735d671be6deb