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

Change-Id: Ie202b2c65d7bb7e206a59d7a62abb8d005fa3cfb