Support the following Omicron changes when they merge. - https://github.com/oxidecomputer/omicron/pull/8894