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