Merge changes Ic0f71df7,Ib6635f00,Ia5d35c32,I9aeafa45 into rvc-dev am: 477e59f84a

Change-Id: I40d3e071318cd3dd1fd4a5d898d73db6a05a45ea