Whitespace formatting changes to help fix presubmit test