cp from master: Docs build: add proper clearsilver comment tag am: d09b4bd8ab am: 6a9ca09693 am: 2f6f6abe4d am: 3960ed8687 am: 3dd6fae212
am: 494b0515b8

Change-Id: Ieeb8dfcc7655a209d149f2ceadd8bbbcad008a79