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

Change-Id: I7a7b77ce52aa29c32f90675c218cc40c03edea8a