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

Change-Id: I40bfef3c40834c9c105d8c1438ab6d94736debd1