Merge "Fixing uint32 size_t mismatches."