am fc08f9df: Merge "Clean up use of Account.name where an email address is expected" into jb-ub-mail-ur10

* commit 'fc08f9dfb8338574421ac9395dd4b71153096bfe':
  Clean up use of Account.name where an email address is expected