Context

!4965 (merged) is required for Protocol J. Cherry-picked all commits from it using the following commands.

$ git checkout -b proto-j-backport-4965
$ git cherry-pick 2629002b667b756337fe01ae233312031ebd9979^..647487712fba48f49e79c99d173bdd0cf6b3843f

Manually testing the MR

Check CI.