This commit also marks for removal APIs that were deprecated a long time ago but were not marked for removal. See gh-33809