Merge #28407 Improve test coverage of make_msgid.