Merge "Revert "Add a configurable version of the policy engine based on PFW""