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

Change-Id: Ie6bc94588c99d27be91851f688339c91ce27f9aa