Merge "eslint: Re-enable valid-jsdoc and make a pass"