Merge "Fix golem runs." am: e937c045a5
am: ac720d921c

Change-Id: I4f55992f03ccc702b965910deeaee3714334b4ab