Merge "Revert "Enable FastTrack timestamps"" into nyc-dev
am: d25c45526d

* commit 'd25c45526d9598218433b0fa59e1f5accbd5b639':
  Revert "Enable FastTrack timestamps"