[Bug 984315] Lint fixes