Merge changes Ie3b71978,Iead1be02,Id79fad2d,Ie3759e6c into rvc-dev am: d9ea505469

Change-Id: I81d76389509833b7bc7ead52957053e3964da0dd