Fix build after cherry-pick.