Merge "Support int32_t (Java Integer) in KeyValuePair atom"