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

Change-Id: I48b4a7a22800c239a7fea5ef95197899a1b07e20