Also merge two 'Remove deprecated symbols' sections PiperOrigin-RevId: 482171490 (cherry picked from commit a4965053)
