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

* commit '6137062b06d686925f74b7e19aa3bfa700ba14bb':
  Add strings for revised settings page.