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

Change-Id: Iec9a061d0f91993e65c5d110955e8f23b0f0d945