Merge "Remove insecure dependency on PolicyEngineAPI"