Merge "Fix one last use of size_t instead of uint32_t."