Merge "Change ResourceType cookies to int32_t."