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

* commit '48755089c15f58284fb5ccccc5bd3874b4527643':
  Reorganize phone account settings.