Merge "Avoid leaking property values into logs on error"