Merge "Remove unnecessary null check" into nyc-support-25.3-dev
am: 82f70a69e5

Change-Id: Iac80f4a293a614de25687b7c9c0cf9785d13da3e