Merge "Replace short with int16_t."