am 4fed4153: Merge "Small change to CTS" into klp-modular-dev

* commit '4fed4153f565a48f4be90e550763767bde7d36b0':
  Small change to CTS