Merge "Revert "Enable write-ahead logging for keystore db.""