Format fixes for r205990