Bug 866790 - Follow up to fix lint errors