[CM Merge] Store DATE_TAKEN in miliseconds

Change-Id: If7d436327368fd6d383d8f6bc94e4c8621072238