Merge "Replace TelephonyManager methods for mobile data"