Merge "Update audio primitives to avoid unsigned overflow"