Merge "Expose EDID fields in DeviceProductInfo"