LPS-9603


Hey Jon. After running ant format-source, I only got a few line-ending diffs.