Cherrypick from master: add proper clearsilver comment tag am: 584da1a1fa am: cb6238649e am: deaeb8ca05
am: 76e04be689

Change-Id: I69434d33a6a25eabdb6a138ca2dad7457c8ef973