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

* commit '4127aa3995259926225d6f8913fb6d0bc357284f':
  Refactoring util libraries in CTS.