Bug 868363 - Fixing lint errors