Merge "Remove KM dependency on RemoteProvisioner"