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

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