Merge changes I14bb4722,I01f139b3 into rvc-dev am: 07b29771b8

Change-Id: I6972304c760b67c406465e24356036aef55225e6