am d1724df6: am 9b1383a4: Merge "Fixed settings crash issue while recovering...
am d1724df6: am 9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev automerge: f128cff2
* commit 'd1724df6':
Fixed settings crash issue while recovering from phone crash.