Merge "Apply MainlineTestModuleController to ExtServicesUnitTests" into rvc-dev