am cc1069de: am 4d2ff99b: am 91007154: Fix Carrier settings crash issue

* commit 'cc1069de1de49f27f81bc7978e17f6568cdeb872':
  Fix Carrier settings crash issue