Fix Bug 936498 - Fix lint errors present on master

https://bugzilla.mozilla.org/show_bug.cgi?id=936498