Merge "Fix golem runs."
am: e937c045a5

Change-Id: I775b2f5fab1f3c7d7a81cc71f1ab2c6cd90ad317