Merge "Use NORMAL synchronous mode for WAL journal mode" into pi-dev am: 4ca34d7bd7
am: eb44a1a85f

Change-Id: I170456c203f54a4b3c0f9042a7dd88574d6b3f26