Merge "Fix TelephonyManager to grab the best context" into ics-mr1