GAP: Fix compilation for security fixes

Fix compilation for security fixes

Change-Id: Ibface72c42f73959d1712522a294e5f66fa0f75f
CRs-Fixed: 2585102
3 files changed