Update raw.c

Part of CAF Merge