Reinstate support for real hardware with Ubuntu.

Change-Id: Ibfdcd9c4b707a41258153c15a09d5976311080a0
Merge "Reinstate support for real hardware with Ubuntu."