Merge "fix(tests): undelegate pdev granules if DA ABI fails"