Merge "config for 5.0.0 policy-handler new PDP API"