Merge "Fix errorprone 2.15.0 errors"