fix cherry-pick typo