Merge changes from topic "extservices" into rvc-dev

* changes:
  Apply MainlineTestModuleController to cts tests
  Apply MainlineTestModuleController to cts tests