Please enjoy these lint fixes.
Merge pull request #11423 from cachedout/lint_fixes

Please enjoy these lint fixes.