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

Change-Id: Ib72d0643cb7b83299dcba8b43c8db97bb4d8e70e