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

Change-Id: Ifcb82498c1f6df251ffdd85d3f9384d6d00a096e