Merge "Changed regex matching for MCC and MNC"
am: 5ffb4ad657

Change-Id: I64b9c2bb033f6469a837689ebc603be5be5aff75