Merge "Reduce expected network usage of RemoteProvisioner" into sc-dev