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

Change-Id: I5341611654406945c4fa50e5e41361c22d7b07bb