Merge "Unbreak buildbot dx host tests" am: 1194f8f6ec am: 013036df2f
am: 896df9a65b

Change-Id: I05d1c6eec13bb3f4979426c1235b95d67b1870d3