Merge "Make sure we also check for "account" to be backwards compatible" into jb-ub-mail-ur8