Merge "Enable sqlite3 logging in keystore2"