Automatic merge from submit-queue (batch tested with PRs 40232, 40235, 40237, 40240) Fixup pet terminology in log and user-facing events **What this PR does / why we need it**: Removes some user-facing strings for pet terminology.