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

Change-Id: I85928a6ea084556a5fe38327dda14926131b0f14