Merge "Remove checkstyle warnings in policy/engine"