Merge "Sonar cleanup for PolicyEngineUtils"