// cherry-pick f64dea99b7f9c70d9ec1e3b4d25cbb4653857433