Merge "Fix up a few callers of GetTypeAndDevice."