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

Change-Id: Ia6ea83a2e9bccb53d3d19b34616867e8b3ba1b1e