Merge "Replace size_t with uint32_t"