Merge "Add mnc and mcc string check"
am: bb560adb22

Change-Id: I147a541bb6324839433a1b3daebd15266b83ee44