Trim spaces on user supplied comments

This helps on bug 29575

Change-Id: Ic05e5898f8a7c93a95188c9342d22c70d7413b09
Merge "Trim spaces on user supplied comments"