Trim trailing empty white space in block content

Change-Id: Ib20d74748f9c7fb198727025a3d48cee75c72ed2
Merge "Trim trailing empty white space in block content"