bug 1035649
This fix moves the correct device into the namespace and improves the test
to ensure the proper device was moved. The previous generic check
failed to catch an error during refactoring.
Change-Id: Ifa2e2bb97dc923549d00b1750c61a22e139647d7