Merge "Stop-gap for buildbot and golem testing." am: c5fb897aab am: 11a98a23f2
am: 1670a38759

Change-Id: I6063212a2c0a1779a9ae5dbf71e16a762ddcaf4b