Merge "Change timestamp unit from nanos to millis" am: 4aee28ea31 am: 3a63fa76ed

Change-Id: I50f8f739eaf93050cc3f282aca273af5dc6a8e3c