Merge "Fix UnusedVariable errorprone issues" into main