Merge "Add device type to falsing data for normalization purposes."