am 7ef71cb8: Merge "Refactoring util libraries in CTS." into klp-dev

* commit '7ef71cb858e7471e712d2fe0fe536bb9028f3ec6':
  Refactoring util libraries in CTS.