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

Change-Id: I8bbc60a5039f65f127abfdfe96d8e62833fb3f09