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

* commit '61bff03ef64af4ddf545a7681873c0671ba25d4c':
  Small change to CTS