post-cherry-pick-cleanups