Merge "SF: Prevent non-sync transactions from syncing" into nyc-dev
am: da8ca93b43

* commit 'da8ca93b430cdb9f1b559e065e194d6701d30291':
  SF: Prevent non-sync transactions from syncing