am 45791e4a: am b7a0634a: Merge "Safely read carrier config." into mnc-dev

* commit '45791e4a3a73120a155dc55e0a6ab9009c4ddbf2':
  Safely read carrier config.