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

Change-Id: I280e97d660903bb785575458f6b4cc47595bd14f