[4.2] Dependency Fixes (Updated)

Here is #3941 without the carbon version bump.