Merge "IPACM: fix klocwork issue"