Merge "Enforcing canonicalization of DeviceInfo."