Merge "Refactoring util libraries in CTS." into klp-dev