Merge "set default journal mode to TRUNCATE, not PERSIST"
am: d4a9b5b

* commit 'd4a9b5bad7f2f4b1ea3234777e66e6d4e092e5d4':
  set default journal mode to TRUNCATE, not PERSIST