am 588d0e1a: Merge "Reorganize phone account settings." into lmp-dev

* commit '588d0e1a955121b0301baf0e50a52c2f6daede0f':
  Reorganize phone account settings.