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

Change-Id: I4db855e9cf6e39c128b2ece9d4c61c326e919b3c