Fix new checkstyle issues in policy-api