Merge "Revert "Stop-gap for buildbot and golem testing."" am: dc4b770887 am: 00dca2c4e2
am: 11deb1a1d7

Change-Id: I86a5b40c33704f4b6a305e589824f1adb0381aa2