Resolve integration issue and release mode compilation error

Change-Id: I4c14415ec23235a3907d27d21b643c46bc304e68
Signed-off-by: Phil Nguyen <philn@qce.qualcomm.com>