Merge "Const correctness handle / RedactionInfo."