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

Change-Id: I8d3d6060ae77a17c65de1dde3eb20cc61e6ed096