Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1