Merge "Add sanitizer for account name" into jb-ub-mail-ur10