Merge "Fix OverlayConfigTest failures after reordering partitions." into main