Merge "Unit tests for DEFERRAL_POLICY_UNTIL_ACTIVE." into udc-dev