Merge "Revert "Update EXIF""