Merge "Fix Sonar Issues policy/engine POLICY-SDK-APP module"