Merge "Fix build break for size_t vs. uint32_t difference."