cherry-pick-votes: propose another commit

It contains a fix for a build issue introduced by an already-proposed
commit.
cherry-pick-votes: more commit votes