aosp telephony + some cm allignment