[CLEANUP] - Checkstyle cleanup in platform project.
Merge pull request #1665 from jeffreythomas/dev

[CLEANUP] - Checkstyle cleanup in platform project.