Bug 866746 - Fix lint errors introduced by 1419f0 r=RudyLu