Revert "Revert "bring up a baseline for device detecting""

This reverts commit 7a0ab72325714712bb682d5110bf877317e67f33.