Merge "Remove unnecessary null check" into nyc-support-25.3-dev