We should have an automated way of automatically rebase/merge upstream changes into our downstream fork.

We can rely on test-infra's automator.sh script for that. Then periodic jobs on prow could use it to run the sync once a day, creating a PR with the changes and filing an issue if the rebase/merge fails.