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

Change-Id: I008e977734fbf66d506a5bc11d191887cde65058