Merge "Fix RedactionInfo null pointer when reading a newly created file"