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

Change-Id: I714f88d77722e3794f5527e6d10161632be2fba4