Merge "Remove lint-baseline"