Bug 855814 - Fix lint issues introduced by evanxd patch