Merge "Adjust spacing before NOLINT comments in ART."