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

Change-Id: I05631384ab872a2874ad7c207914aa80acb204f7