Merge "remove the policy and security issue dependencies"