Merge "Plumbing for getting FenceTracker timestamps" into nyc-mr1-dev