Check device on correct host

Change-Id: Ie8e977adea90c8ba0219bc8bb93a6ed37e90f465