Merge "Add new Telephony feature flags and update API annotations"