Merge 41fc9745d4a448db7d932250d22fac1dda287443 into 658c6390a5b363f46c6ad448ad1bce9d6e97e53a
Accepts #1889
PiperOrigin-RevId: 216709878