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

* commit 'c0b5eef6c97675cd7301487726f9732e8054bae3':
  Reorganize phone account settings.