Fix spacing lint issues.
Merge pull request #8949 from s0undt3ch/develop

Fix spacing lint issues.