Merge "Fix carrier config string typo." into qt-qpr1-dev