Merge change I7bc67c51 into eclair-mr2

* changes:
  Manual merge of donut-gms cts.mk changes.