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

Change-Id: If1f8eaa3ecc2439db01a437a1b098260d0fc8c22