am 66af4540: am 6137062b: am 3ecea0ad: Merge "Add strings for revised settings page." into lmp-dev

* commit '66af4540c83d20801d865a096199f4190a494d77':
  Add strings for revised settings page.