Merge "Match new errorprone api" into main