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

Change-Id: Ic9193590b58b9265bb7a3e350f29d969de1c4ef6