Merge "Retry setting DO/PO to avoid flakiness when recently unset." into sc-dev