Merge "Revert "Update OccupantZone config to match magpie"" into udc-dev