Fix broken merge for age/dob work. [Fixes #74854608] [Fixes #74854712]