Revert "Revert "Stop-gap for buildbot and golem testing.""

This reverts commit c3f9cd6be329e1d115d7156fa55e36cc6ed980ba.

Reason for revert: golem breakage is unrelated.

Change-Id: I5fcf9013379cf00d0d85436c0225cf6cfd412f84
2 files changed