Merge "Add mnc and mcc string check" am: bb560adb22 am: 2140f5c791
am: 6dadccaa3a

Change-Id: I1ab80c390192f9ed174ea60e9da4d0e6ddd5909e