Merge "Fix edge-cases for split-user provisioning cases."