Merge change 24712 into eclair

* changes:
  Fix CS templates to handle non-included classes.