Merge "Revert "Move tests to postsubmit to reduce lab reporting load temporarily""
diff --git a/luni/src/main/java/java/math/TEST_MAPPING b/luni/src/main/java/java/math/TEST_MAPPING
index 6b9ceb7..1038858 100644
--- a/luni/src/main/java/java/math/TEST_MAPPING
+++ b/luni/src/main/java/java/math/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/luni/src/main/java/java/nio/TEST_MAPPING b/luni/src/main/java/java/nio/TEST_MAPPING
index 9f40bc4..3fe450e 100644
--- a/luni/src/main/java/java/nio/TEST_MAPPING
+++ b/luni/src/main/java/java/nio/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/luni/src/main/java/java/nio/charset/TEST_MAPPING b/luni/src/main/java/java/nio/charset/TEST_MAPPING
index 7dcd5b4..ec926f9 100644
--- a/luni/src/main/java/java/nio/charset/TEST_MAPPING
+++ b/luni/src/main/java/java/nio/charset/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/awt/font/TEST_MAPPING b/ojluni/src/main/java/java/awt/font/TEST_MAPPING
index 08d4188..a23d298 100644
--- a/ojluni/src/main/java/java/awt/font/TEST_MAPPING
+++ b/ojluni/src/main/java/java/awt/font/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/beans/TEST_MAPPING b/ojluni/src/main/java/java/beans/TEST_MAPPING
index 93fff5b..0e669a8 100644
--- a/ojluni/src/main/java/java/beans/TEST_MAPPING
+++ b/ojluni/src/main/java/java/beans/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/io/TEST_MAPPING b/ojluni/src/main/java/java/io/TEST_MAPPING
index c70c8cc..6eb3bd7 100644
--- a/ojluni/src/main/java/java/io/TEST_MAPPING
+++ b/ojluni/src/main/java/java/io/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/lang/annotation/TEST_MAPPING b/ojluni/src/main/java/java/lang/annotation/TEST_MAPPING
index 4b5bc6b..f5f6365 100644
--- a/ojluni/src/main/java/java/lang/annotation/TEST_MAPPING
+++ b/ojluni/src/main/java/java/lang/annotation/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/lang/reflect/TEST_MAPPING b/ojluni/src/main/java/java/lang/reflect/TEST_MAPPING
index 7013f76..2d13e0a 100644
--- a/ojluni/src/main/java/java/lang/reflect/TEST_MAPPING
+++ b/ojluni/src/main/java/java/lang/reflect/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/nio/channels/TEST_MAPPING b/ojluni/src/main/java/java/nio/channels/TEST_MAPPING
index 0352abb..dfb741c 100644
--- a/ojluni/src/main/java/java/nio/channels/TEST_MAPPING
+++ b/ojluni/src/main/java/java/nio/channels/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/nio/channels/spi/TEST_MAPPING b/ojluni/src/main/java/java/nio/channels/spi/TEST_MAPPING
index f3673a8..7974b9a 100644
--- a/ojluni/src/main/java/java/nio/channels/spi/TEST_MAPPING
+++ b/ojluni/src/main/java/java/nio/channels/spi/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/nio/file/TEST_MAPPING b/ojluni/src/main/java/java/nio/file/TEST_MAPPING
index eb0b296..24bd29a 100644
--- a/ojluni/src/main/java/java/nio/file/TEST_MAPPING
+++ b/ojluni/src/main/java/java/nio/file/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING b/ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING
index 143c92c..b6c90d4 100644
--- a/ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING
+++ b/ojluni/src/main/java/java/nio/file/attribute/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/nio/file/spi/TEST_MAPPING b/ojluni/src/main/java/java/nio/file/spi/TEST_MAPPING
index 49b6e63..632f30c 100644
--- a/ojluni/src/main/java/java/nio/file/spi/TEST_MAPPING
+++ b/ojluni/src/main/java/java/nio/file/spi/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/security/TEST_MAPPING b/ojluni/src/main/java/java/security/TEST_MAPPING
index f26952a..53b2818 100644
--- a/ojluni/src/main/java/java/security/TEST_MAPPING
+++ b/ojluni/src/main/java/java/security/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/security/acl/TEST_MAPPING b/ojluni/src/main/java/java/security/acl/TEST_MAPPING
index ead5724..864ca28 100644
--- a/ojluni/src/main/java/java/security/acl/TEST_MAPPING
+++ b/ojluni/src/main/java/java/security/acl/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/security/cert/TEST_MAPPING b/ojluni/src/main/java/java/security/cert/TEST_MAPPING
index 20d60b4..267b914 100644
--- a/ojluni/src/main/java/java/security/cert/TEST_MAPPING
+++ b/ojluni/src/main/java/java/security/cert/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/security/interfaces/TEST_MAPPING b/ojluni/src/main/java/java/security/interfaces/TEST_MAPPING
index fccf776..3c28d51 100644
--- a/ojluni/src/main/java/java/security/interfaces/TEST_MAPPING
+++ b/ojluni/src/main/java/java/security/interfaces/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/security/spec/TEST_MAPPING b/ojluni/src/main/java/java/security/spec/TEST_MAPPING
index aad544b..f54aac6 100644
--- a/ojluni/src/main/java/java/security/spec/TEST_MAPPING
+++ b/ojluni/src/main/java/java/security/spec/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/sql/TEST_MAPPING b/ojluni/src/main/java/java/sql/TEST_MAPPING
index 3e39e62..28cf3b3 100644
--- a/ojluni/src/main/java/java/sql/TEST_MAPPING
+++ b/ojluni/src/main/java/java/sql/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/text/TEST_MAPPING b/ojluni/src/main/java/java/text/TEST_MAPPING
index 35cfca5..30747b2 100644
--- a/ojluni/src/main/java/java/text/TEST_MAPPING
+++ b/ojluni/src/main/java/java/text/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/time/TEST_MAPPING b/ojluni/src/main/java/java/time/TEST_MAPPING
index f7e999f..5b24483 100644
--- a/ojluni/src/main/java/java/time/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/time/chrono/TEST_MAPPING b/ojluni/src/main/java/java/time/chrono/TEST_MAPPING
index c1ee236..461c15d 100644
--- a/ojluni/src/main/java/java/time/chrono/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/chrono/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/time/format/TEST_MAPPING b/ojluni/src/main/java/java/time/format/TEST_MAPPING
index 7ca2af8..42286e4 100644
--- a/ojluni/src/main/java/java/time/format/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/format/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/time/temporal/TEST_MAPPING b/ojluni/src/main/java/java/time/temporal/TEST_MAPPING
index e0ab39c..deac48a 100644
--- a/ojluni/src/main/java/java/time/temporal/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/temporal/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/time/zone/TEST_MAPPING b/ojluni/src/main/java/java/time/zone/TEST_MAPPING
index fe9e377..1c8c89e 100644
--- a/ojluni/src/main/java/java/time/zone/TEST_MAPPING
+++ b/ojluni/src/main/java/java/time/zone/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/util/TEST_MAPPING b/ojluni/src/main/java/java/util/TEST_MAPPING
index d67d653..e1434fb 100644
--- a/ojluni/src/main/java/java/util/TEST_MAPPING
+++ b/ojluni/src/main/java/java/util/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/util/concurrent/TEST_MAPPING b/ojluni/src/main/java/java/util/concurrent/TEST_MAPPING
index 7f26b61..5730a28 100644
--- a/ojluni/src/main/java/java/util/concurrent/TEST_MAPPING
+++ b/ojluni/src/main/java/java/util/concurrent/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreJsr166TestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/util/function/TEST_MAPPING b/ojluni/src/main/java/java/util/function/TEST_MAPPING
index 33c18dd..5840cf9 100644
--- a/ojluni/src/main/java/java/util/function/TEST_MAPPING
+++ b/ojluni/src/main/java/java/util/function/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/util/jar/TEST_MAPPING b/ojluni/src/main/java/java/util/jar/TEST_MAPPING
index b59ad7d..5b26443 100644
--- a/ojluni/src/main/java/java/util/jar/TEST_MAPPING
+++ b/ojluni/src/main/java/java/util/jar/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/util/logging/TEST_MAPPING b/ojluni/src/main/java/java/util/logging/TEST_MAPPING
index bcc3eab..85f4d2b 100644
--- a/ojluni/src/main/java/java/util/logging/TEST_MAPPING
+++ b/ojluni/src/main/java/java/util/logging/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/util/prefs/TEST_MAPPING b/ojluni/src/main/java/java/util/prefs/TEST_MAPPING
index 74bd06e..3a3445b 100644
--- a/ojluni/src/main/java/java/util/prefs/TEST_MAPPING
+++ b/ojluni/src/main/java/java/util/prefs/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/util/regex/TEST_MAPPING b/ojluni/src/main/java/java/util/regex/TEST_MAPPING
index a2bd15f..1bd44e2 100644
--- a/ojluni/src/main/java/java/util/regex/TEST_MAPPING
+++ b/ojluni/src/main/java/java/util/regex/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/util/stream/TEST_MAPPING b/ojluni/src/main/java/java/util/stream/TEST_MAPPING
index 68a9271..9673e09 100644
--- a/ojluni/src/main/java/java/util/stream/TEST_MAPPING
+++ b/ojluni/src/main/java/java/util/stream/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreOjTestCases",
       "options": [
diff --git a/ojluni/src/main/java/java/util/zip/TEST_MAPPING b/ojluni/src/main/java/java/util/zip/TEST_MAPPING
index f9f0e88..52ac932 100644
--- a/ojluni/src/main/java/java/util/zip/TEST_MAPPING
+++ b/ojluni/src/main/java/java/util/zip/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/crypto/TEST_MAPPING b/ojluni/src/main/java/javax/crypto/TEST_MAPPING
index e6c5716..6860a5c 100644
--- a/ojluni/src/main/java/javax/crypto/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/crypto/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/crypto/interfaces/TEST_MAPPING b/ojluni/src/main/java/javax/crypto/interfaces/TEST_MAPPING
index 79e89d4..427bf79 100644
--- a/ojluni/src/main/java/javax/crypto/interfaces/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/crypto/interfaces/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/crypto/spec/TEST_MAPPING b/ojluni/src/main/java/javax/crypto/spec/TEST_MAPPING
index 2984ed2..d1e9d5a 100644
--- a/ojluni/src/main/java/javax/crypto/spec/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/crypto/spec/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/net/TEST_MAPPING b/ojluni/src/main/java/javax/net/TEST_MAPPING
index a05ba36..aeabde8 100644
--- a/ojluni/src/main/java/javax/net/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/net/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/net/ssl/TEST_MAPPING b/ojluni/src/main/java/javax/net/ssl/TEST_MAPPING
index 39589f4..d3ae570 100644
--- a/ojluni/src/main/java/javax/net/ssl/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/net/ssl/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/security/auth/TEST_MAPPING b/ojluni/src/main/java/javax/security/auth/TEST_MAPPING
index 90c80bc..45bd9c7 100644
--- a/ojluni/src/main/java/javax/security/auth/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/security/auth/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/security/auth/callback/TEST_MAPPING b/ojluni/src/main/java/javax/security/auth/callback/TEST_MAPPING
index 23af453..e742b17 100644
--- a/ojluni/src/main/java/javax/security/auth/callback/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/security/auth/callback/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/security/auth/login/TEST_MAPPING b/ojluni/src/main/java/javax/security/auth/login/TEST_MAPPING
index 03d7d03..a22e2b3 100644
--- a/ojluni/src/main/java/javax/security/auth/login/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/security/auth/login/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/security/auth/x500/TEST_MAPPING b/ojluni/src/main/java/javax/security/auth/x500/TEST_MAPPING
index 48aafe7..3ba13da 100644
--- a/ojluni/src/main/java/javax/security/auth/x500/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/security/auth/x500/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/security/cert/TEST_MAPPING b/ojluni/src/main/java/javax/security/cert/TEST_MAPPING
index 966b756..4603638 100644
--- a/ojluni/src/main/java/javax/security/cert/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/security/cert/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/javax/sql/TEST_MAPPING b/ojluni/src/main/java/javax/sql/TEST_MAPPING
index a5d3289..bbbb56c 100644
--- a/ojluni/src/main/java/javax/sql/TEST_MAPPING
+++ b/ojluni/src/main/java/javax/sql/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/sun/invoke/util/TEST_MAPPING b/ojluni/src/main/java/sun/invoke/util/TEST_MAPPING
index ee2ddce..48ae161 100644
--- a/ojluni/src/main/java/sun/invoke/util/TEST_MAPPING
+++ b/ojluni/src/main/java/sun/invoke/util/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/sun/misc/TEST_MAPPING b/ojluni/src/main/java/sun/misc/TEST_MAPPING
index 3f3df57..f0d2cec 100644
--- a/ojluni/src/main/java/sun/misc/TEST_MAPPING
+++ b/ojluni/src/main/java/sun/misc/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/sun/net/util/TEST_MAPPING b/ojluni/src/main/java/sun/net/util/TEST_MAPPING
index 69fde07..068b5da 100644
--- a/ojluni/src/main/java/sun/net/util/TEST_MAPPING
+++ b/ojluni/src/main/java/sun/net/util/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/sun/security/jca/TEST_MAPPING b/ojluni/src/main/java/sun/security/jca/TEST_MAPPING
index ca53dcc..02e5a74 100644
--- a/ojluni/src/main/java/sun/security/jca/TEST_MAPPING
+++ b/ojluni/src/main/java/sun/security/jca/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/sun/security/pkcs/TEST_MAPPING b/ojluni/src/main/java/sun/security/pkcs/TEST_MAPPING
index fb418db..3f37df7 100644
--- a/ojluni/src/main/java/sun/security/pkcs/TEST_MAPPING
+++ b/ojluni/src/main/java/sun/security/pkcs/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/sun/security/x509/TEST_MAPPING b/ojluni/src/main/java/sun/security/x509/TEST_MAPPING
index eb113b5..92012a6 100644
--- a/ojluni/src/main/java/sun/security/x509/TEST_MAPPING
+++ b/ojluni/src/main/java/sun/security/x509/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [
diff --git a/ojluni/src/main/java/sun/util/logging/TEST_MAPPING b/ojluni/src/main/java/sun/util/logging/TEST_MAPPING
index 795ec37..e3bb92a 100644
--- a/ojluni/src/main/java/sun/util/logging/TEST_MAPPING
+++ b/ojluni/src/main/java/sun/util/logging/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsLibcoreTestCases",
       "options": [