Bug 855814 - Fix lint issues introduced by evanxd patch
Merge pull request #9573 from gaye/fix-lint-error

Bug 855814 - Fix lint issues introduced by evanxd patch