Merge changes Ib927629c,Iac268723

* changes:
  Update copyright dates on generated CTS files.
  Fix inconsistency between API generator and CTS files