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

* commit '1fd0a2b0ed46b9809de793daeb1593aecf1809e1':
  Refactoring util libraries in CTS.