PhoneCommon and Phone to aosp