Merge changes I9f0a440d,I0b734cc7,I510ee307,Ia257021d into rvc-dev am: d050812a30

Change-Id: Iff281350d96d76ebd862ae71de98bbf5fa17be28