am e6510750: Merge "Use repeatable timestamps"

* commit 'e65107508adbea88fcc1ec51dcf28d4216365753':
  Use repeatable timestamps