am 16be4106: Merge "Refactoring CTS to remove PTS references." into klp-dev

* commit '16be4106cf187c1a9002023b65ff653823c1c668':
  Refactoring CTS to remove PTS references.