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

Change-Id: Idb8b66ac752ca01978d38eed59e01bcd7351c9d2