Merge "dcaegen2 policy-handler CI job change"