Merge "cp from master: Docs build: add proper clearsilver comment tag am: d09b4bd8ab am: 262ce89f06 am: f65dc55ff6" into oc-mr1-dev-plus-aosp
am: 505440edde

Change-Id: I6ea97b8d5179090f1d01e9d27ee2b33f5fcc5fab