Merge "Removed reference to TelephonyManager#from"