Merge change I0b6ee9fc into eclair

* changes:
  DATE_TAKEN should be in millisecond instead of second.