am 98b7584e: am 2a857c63: Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev

* commit '98b7584e1c45b9963a59de1625594c704065c575':
  Work on issue #17624121: Settings crash while launching on wiped device