Merge "Rename EXTRA_TIMESTAMP into EXTRA_TIMESTAMP_MILLIS"