Merge "Workaround for repo incompatibilities on buildbot."