am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"

* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable