Merge "cleanup up appRestrictions policy in the policy engine" into udc-dev