am 87408ffd: am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev

* commit '87408ffda1d101efb2cc56b657468318374488d9':
  Fix change to re-add carrier roaming details.