Merge "Reduce expected network usage of RemoteProvisioner"