am 671b8ff5: Merge "Use repeatable timestamps"

* commit '671b8ff5457472631f805f3230273e5e8121b28a':
  Use repeatable timestamps