Merge "Remove DelegatingNormalizedNodeStreamWriter"