Merge "Address lint warnings in diagnostics collector" into main