Merge "Fixes for errorprone update" into main

Parents: 812f691 , 188040d

Committed by Gerrit Code Review <noreply-gerritcodereview@google.com> on 10/10/2024, 5:45:00 PM