Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2

Change-Id: I22e6b323c80aea7e240872d23d920c851492cd17