Word-wrap fix for comment block

Change-Id: Ica0411bed9856f41c784f176608604d547764e56
Merge "Word-wrap fix for comment block" into production