Use Rendered version of comments to fix newlines

Change-Id: Ifd62611100dc1a41f1f02f9bf5fb986e3a43b205