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

Change-Id: I80cdb940517774fe899fab6d4f088ff586c14e49