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

* commit '823161c92250a4aad687a488c4f63e4704d02660':
  Refactoring CTS to remove PTS references.