Merge "Cleanup the null checks added in ag/30408877" into main