Merge "For consistency with getAuthToken, pass UID/PID for add account. Needed for customizing the add account flow"