Merge "Make writeKeyValuePairs accept Nullable args"