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

Change-Id: Id044555ed52808e4f94282c5614033ba157c2484