Merge "Lint infrastructure fixes"