am c518764b: Merge "Fix runtest cts-net" into klp-dev

* commit 'c518764b02d4b99b06400dd1903019b1f44a78bf':
  Fix runtest cts-net