Merge change Ib01005ea into eclair-mr2

* changes:
  Avoid extracting EXIF data for non-JPEG images.