am 84bb279e: am f736a605: am 52579125: Merge "Persist the line 1 number and simplified network settings page." into lmp-dev

* commit '84bb279e5fd1ae501dc595feb1d6a2b571f8823d':
  Persist the line 1 number and simplified network settings page.