lint fixes
Merge pull request #10453 from rallytime/lint_fixes

lint fixes