Merge "PBAP C: Fix klocwork issue"