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

Change-Id: I077d64410b2b86028b7edc086a53298f264ab2e3