Merge "Fix policy-models-pdp dependency"