Merge "Fix ImpossibleNullComparison errorprone warning" into main