Merge "Fix carrier config string typo." into qt-qpr1-dev am: 0b5967db am: cc9a1fab am: a004c32d Change-Id: Iad35c010fe2e05ae0444821f10de0a00952fb1ee