cp from master: Docs build: add proper clearsilver comment tag
am: d09b4bd8ab

Change-Id: I7564062eef80388c49d562444721d9238cb36087