am 8716c081: Merge "Use correct timescale for "date taken" field" into klp-dev

* commit '8716c08151378f7488a0f129fe43a0b3d4dc499d':
  Use correct timescale for "date taken" field