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

Change-Id: Ia26b3e5e6ba7331b906bb8bbe6a56c03fd693a02