Merge "Add Configuration to APF Policy" into oc-dr1-dev