Merge "Revert "Enable FastTrack timestamps"" into nyc-dev