Merge "Fix errorprone issues" into main