cherry-pick-5a494fc5f3c0.patch
