Merge "Do not depend on all of NetworkStack in CTS"