Merge "Whitelist new lint errors"