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

* commit '4d2ff99bba68ca4fe6a410fae3d42513180e84cd':
  Fix Carrier settings crash issue