Merge "Allow tests to specify local device types" into sc-dev