Merge "Changed regex matching for MCC and MNC" into qt-qpr1-dev