Merge "Change timestamp unit from nanos to millis"