Pull in a couple telephony changes from Android's 'master' baseline as well as CyanogenMod 10.1