--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp	Fri Oct 28 12:28:46 2016 -0700
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp	Fri Oct 28 19:33:22 2016 +0000
@@ -551,11 +551,6 @@
 }
 
 void ClassStatsDCmd::execute(DCmdSource source, TRAPS) {
-  if (!UnlockDiagnosticVMOptions) {
-    output()->print_cr("GC.class_stats command requires -XX:+UnlockDiagnosticVMOptions");
-    return;
-  }
-
   VM_GC_HeapInspection heapop(output(),
                               true /* request_full_gc */);
   heapop.set_csv_format(_csv.value());
@@ -996,8 +991,8 @@
 {}
 
 void TouchedMethodsDCmd::execute(DCmdSource source, TRAPS) {
-  if (!UnlockDiagnosticVMOptions) {
-    output()->print_cr("VM.touched_methods command requires -XX:+UnlockDiagnosticVMOptions");
+  if (!LogTouchedMethods) {
+    output()->print_cr("VM.print_touched_methods command requires -XX:+LogTouchedMethods");
     return;
   }
   VM_DumpTouchedMethods dumper(output());

--- a/hotspot/src/share/vm/services/diagnosticCommand.hpp	Fri Oct 28 12:28:46 2016 -0700
+++ b/hotspot/src/share/vm/services/diagnosticCommand.hpp	Fri Oct 28 19:33:22 2016 +0000
@@ -386,7 +386,7 @@
     return "GC.class_stats";
   }
   static const char* description() {
-    return "Provide statistics about Java class meta data. Requires -XX:+UnlockDiagnosticVMOptions.";
+    return "Provide statistics about Java class meta data.";
   }
   static const char* impact() {
     return "High: Depends on Java heap size and content.";

--- a/hotspot/test/serviceability/sa/TestInstanceKlassSize.java	Fri Oct 28 12:28:46 2016 -0700
+++ b/hotspot/test/serviceability/sa/TestInstanceKlassSize.java	Fri Oct 28 19:33:22 2016 +0000
@@ -98,7 +98,6 @@
         OutputAnalyzer output = null;
         try {
             List<String> vmArgs = new ArrayList<String>();
-            vmArgs.add("-XX:+UnlockDiagnosticVMOptions");
             vmArgs.add("-XX:+UsePerfData");
             vmArgs.addAll(Utils.getVmOptions());
             app = LingeredApp.startApp(vmArgs);

--- a/hotspot/test/serviceability/sa/TestInstanceKlassSizeForInterface.java	Fri Oct 28 12:28:46 2016 -0700
+++ b/hotspot/test/serviceability/sa/TestInstanceKlassSizeForInterface.java	Fri Oct 28 19:33:22 2016 +0000
@@ -45,7 +45,6 @@
  *          --add-exports=jdk.hotspot.agent/sun.jvm.hotspot.debugger=ALL-UNNAMED
  *          TestInstanceKlassSizeForInterface.java
  * @run main/othervm
- *          -XX:+UnlockDiagnosticVMOptions
  *          --add-modules=jdk.hotspot.agent
  *          --add-exports=jdk.hotspot.agent/sun.jvm.hotspot=ALL-UNNAMED
  *          --add-exports=jdk.hotspot.agent/sun.jvm.hotspot.utilities=ALL-UNNAMED