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

Change-Id: I575627881592fa6c6ebc94112d0b3a9aa8f1bb63