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

Change-Id: Iebd977f304abe61047614e57efbe094494839447