Timestamp in seconds, not ms.

Change-Id: I2822e64aa990832b36f6c69babb5a45f04ad5484
Merge "Timestamp in seconds, not ms."