Merge changes I7c542db9,I6f809ce2 into rvc-dev am: dc1fe78978

Change-Id: I2ed871b97a8cea587e53aeeed09696ddcaf4168d