Merge "Revert "Revert "Stop-gap for buildbot and golem testing."""
am: 5fe9d2db00

Change-Id: I607f85498dda6c77e265521c2d15c2a6bbcaac97