Merge "corrected T-2 (MCC 293 MNC 64) APNs" into gingerbread