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

Change-Id: Iad120e7859342dcd17514243046d1ec6f6fbb661