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

Change-Id: I60c267c96ccee50f046ea5a04a49be330a48720a