Merge "Fixed sonar issues in policy-pap"