am 59f5988a: Merge "Cleanup LoginAccountUtils"

* commit '59f5988a16bfd979f748ecd356b528f0b933a42c':
  Cleanup LoginAccountUtils