Merge "DO NOT MERGE Re-restrict phone ops on user addition" into sc-v2-dev