Merge "Small cleanup in DeviceProductInfo."