Fix release build break

Change-Id: I4d2afc89101a1df3862afeeee21c26a7280293f7
Signed-off-by: Craig Dowell <cdowell@qce.qualcomm.com>
ASACORE-1001: Fix g++ compiler errors in release mode

Change-Id: Ia2715279f2a877b6c001189c194a02dcbb82ec3b
Signed-off-by: Inga Stotland <ingas@qce.qualcomm.com>
Merge "Fix release build break" into feature/udp_transport