Merge "Separate the account name from the account manager's account name" into jb-ub-mail-ur10