Merge "Don't use size_t for variables that store uint32_t value"