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

Change-Id: I8fd5f3afa35072afe418de717a974f8f22fbaf6b