cherry-pick-e481fc655a62.patch
