Merge "Resolved the Policy Removal issue from PDP"