[PDK-5981]DSS and CAL: Fix Static Analysis Issues