am 05506acf: am 45d9cd00: am 3ecea0ad: Merge "Add strings for revised settings page." into lmp-dev

* commit '05506acf177a8aa407bd087671451e9d47b8d568':