Merge "Fix int64_t to unsigned int conversion warnings"