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

Change-Id: I741c8e4f181fbf6c0cefa898368ce5aa30ecc813