Merge "Fix the bug TM#getNetworkCountryISO returns null in SUW." into pi-dev