Merge "Fix errorprone suggestions" into main