Merge "Add mnc and mcc string check" into qt-dev am: 82dc3faca0
am: b386096472

Change-Id: I02e3f89c6e4b25c024c151b19a6c7d15c6c5d191