Merge "afb-api-v3: Fix potential buffer overflow"