Merge "Add test for device type helper functons."