This cherry-picks the upstream work on making protobuf +cpp unnecessary, enabling us to upgrade some python components.
protobuf +cpp