Merge "Don't send null/empty values in SimpleIcsWriter"