Merge changes I22ff91e8,I6dcef977 into rvc-dev am: 52c8bac7d7

Change-Id: If6a25c910eefe80508be543c0b7a74bf35e8f0ab