Merge "SF: Add FenceTracker" into nyc-dev
am: 830f500

* commit '830f5004da53a83e23b4102ba9b72e4cb366cb34':
  SF: Add FenceTracker