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

Change-Id: I5102936c1d964bd6063752ef3e0181331c4f62a8