Merge "IPACM: Fix klocwork issue on master branch"