Phone: Update for AOSP