Merge "Fix UnnecessaryCheckNotNull errorprone issue" into main