Check device on correct host

Change-Id: I72b03109fcf960a6b90eb53a9b6a0f1eb1cee62d