Merge change 21473 into eclair

* changes:
  Fix 1860351: Put datetime in jpeg exif to datetaken field.