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

Change-Id: I0e28c40324974f120784f16c0109160ed5adc110