Merge "Fix erroprone warnings" into main