am 91007154: Fix Carrier settings crash issue

* commit '91007154982fd40f464f3d58ddb20d565b505e53':
  Fix Carrier settings crash issue