Merge pull request #1099 from kehrazy:patch-1

PiperOrigin-RevId: 531313426

Author: copybara-github

openhtf/__init__.py

@@ -16,7 +16,6 @@
 import signal
 import typing
 
-from openhtf import plugs
 from openhtf.core import phase_executor
 from openhtf.core import test_record
 import openhtf.core.base_plugs
@@ -29,6 +28,7 @@
 import openhtf.core.phase_group
 import openhtf.core.phase_nodes
 import openhtf.core.test_descriptor
+import openhtf.plugs
 import openhtf.util
 from openhtf.util import configuration
 from openhtf.util import console_output
@@ -86,7 +86,8 @@
     'conf',
 )
 
-plug = plugs.plug
+plugs = openhtf.plugs
+plug = openhtf.plugs.plug
 BasePlug = openhtf.core.base_plugs.BasePlug
 
 DiagnosesStore = openhtf.core.diagnoses_lib.DiagnosesStore