Merge "Revert "Remove testAtSignInUserInfo and add testMultipleUserField""