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

Change-Id: I0c641a747159c9ed8616f32916d8ab4d15f17438