Merge "SF: Re-enable fence tracker by default" into nyc-mr1-dev
am: 30689c9e4c

* commit '30689c9e4c7cbcfb1f537f224ab1b50f5fe0efa6':
  SF: Re-enable fence tracker by default

Change-Id: I503b5724f8362df99305f9ca9f622a61b329826d