cherry-pick-bce2e6728279.patch
