am f36ad155: am d60fc5d0: Merge "Don\'t turn on sync flush by default."

* commit 'f36ad15527edc489b9f7c8baee298d121ed76aae':
  Don't turn on sync flush by default.