Merge "Change ProvisioningManager API as per review"