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

* commit '22fa825ebbf318dc7942c18a057791a54c7b9bff':
  SF: Re-enable fence tracker by default

Change-Id: If988c4a07b5fd20c2fae16e29a9a5cb699329716