Add an option to allow disk syncing to be turned off
am: 3c01fa7513

Change-Id: I4625e2b899be2631e224239d6f2f86467d099904