Merge "jpegrecoverymap: Update XMP to match spec."