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

Change-Id: Ie9181de22e67dde114a38941c743f4f7c1129d81