Merge "Restoring xtrace state for os-brick plugin"
diff --git a/lib/os_brick b/lib/os_brick
index 690e321..d1cca4a 100644
--- a/lib/os_brick
+++ b/lib/os_brick
@@ -13,7 +13,7 @@
 # - install_os_brick
 
 # Save trace setting
-_XTRACE_CINDER=$(set +o | grep xtrace)
+_XTRACE_OS_BRICK=$(set +o | grep xtrace)
 set +o xtrace
 
 
@@ -27,3 +27,6 @@
         setup_dev_lib "os-brick"
     fi
 }
+
+# Restore xtrace
+$_XTRACE_OS_BRICK
\ No newline at end of file