Automatically converting to millisecond timestamp if the value is large ...

...enough

Change-Id: I558f11db2e662fb35428a3a561e544dd0b13989e