Merge "Rename CommandWriter to CommandWriterBase"