[PTS-bot] Update configuration files

- Update pass and skip list.
- Simplify PtsBotTest configuration file.
- Update PtsBotTestMts configuration file.

Test: atest pts-bot
Change-Id: Idaebfd1d5d93c88a3a2f29d6903ee80b8a25c8cb
diff --git a/android/pandora/server/configs/PtsBotTest.xml b/android/pandora/server/configs/PtsBotTest.xml
index 8fd4dd4..8af3995 100644
--- a/android/pandora/server/configs/PtsBotTest.xml
+++ b/android/pandora/server/configs/PtsBotTest.xml
@@ -29,42 +29,19 @@
         <option name="max-flaky-tests" value="2" />
         <option name="max-retries-per-test" value="3" />
         <option name="physical" value="false" />
-        <option name="profile" value="A2DP/SRC" />
         <option name="profile" value="A2DP/SNK" />
+        <option name="profile" value="A2DP/SRC" />
         <option name="profile" value="AVCTP" />
-        <option name="profile" value="AVDTP/SRC" />
         <option name="profile" value="AVDTP/SNK" />
+        <option name="profile" value="AVDTP/SRC" />
         <option name="profile" value="AVRCP" />
         <option name="profile" value="GAP" />
-        <option name="profile" value="GATT/CL/GAC" />
-        <option name="profile" value="GATT/CL/GAD" />
-        <option name="profile" value="GATT/CL/GAR" />
-        <option name="profile" value="GATT/CL/GAW" />
-        <option name="profile" value="GATT/SR" />
-        <option name="profile" value="HFP/AG/DIS" />
-        <option name="profile" value="HFP/AG/HFI" />
+        <option name="profile" value="GATT" />
         <option name="profile" value="HFP/AG/PSI" />
-        <option name="profile" value="HFP/AG/SLC" />
-        <option name="profile" value="HFP/AG/TCA" />
         <option name="profile" value="HID/HOS" />
-        <option name="profile" value="HOGP/RH" />
+        <option name="profile" value="HOGP" />
         <option name="profile" value="L2CAP/LE" />
-        <option name="profile" value="SDP/SR" />
-        <option name="profile" value="SM/CEN/EKS" />
-        <option name="profile" value="SM/CEN/JW" />
-        <option name="profile" value="SM/CEN/KDU" />
-        <option name="profile" value="SM/CEN/PROT" />
-        <option name="profile" value="SM/CEN/PKE" />
-        <option name="profile" value="SM/CEN/SCJW" />
-        <option name="profile" value="SM/CEN/SCPK" />
-        <option name="profile" value="SM/PER/PROT" />
-        <option name="profile" value="SM/PER/JW" />
-        <option name="profile" value="SM/PER/PKE" />
-        <option name="profile" value="SM/PER/EKS" />
-        <option name="profile" value="SM/PER/KDU" />
-        <option name="profile" value="SM/PER/SCJW" />
-        <option name="profile" value="SM/PER/SCPK" />
-        <option name="profile" value="SM/PER/SCCT" />
-        <option name="profile" value="HOGP/RH" />
+        <option name="profile" value="SDP" />
+        <option name="profile" value="SM" />
     </test>
 </configuration>
diff --git a/android/pandora/server/configs/PtsBotTestMts.xml b/android/pandora/server/configs/PtsBotTestMts.xml
index 8e77aa0..193bd34 100644
--- a/android/pandora/server/configs/PtsBotTestMts.xml
+++ b/android/pandora/server/configs/PtsBotTestMts.xml
@@ -29,29 +29,20 @@
         <option name="max-flaky-tests" value="3" />
         <option name="max-retries-per-test" value="3" />
         <option name="physical" value="false" />
-        <option name="profile" value="A2DP/SRC" />
         <option name="profile" value="A2DP/SNK" />
+        <option name="profile" value="A2DP/SRC" />
         <option name="profile" value="AVCTP" />
-        <option name="profile" value="AVDTP/SRC" />
         <option name="profile" value="AVDTP/SNK" />
+        <option name="profile" value="AVDTP/SRC" />
         <option name="profile" value="AVRCP" />
         <option name="profile" value="GAP" />
-        <option name="profile" value="GATT/CL/GAC" />
-        <option name="profile" value="GATT/CL/GAD" />
-        <option name="profile" value="GATT/CL/GAR" />
-        <option name="profile" value="GATT/CL/GAW" />
-        <option name="profile" value="GATT/SR" />
-        <option name="profile" value="HFP/AG/DIS" />
-        <option name="profile" value="HFP/AG/HFI" />
+        <option name="profile" value="GATT" />
         <option name="profile" value="HFP/AG/PSI" />
-        <option name="profile" value="HFP/AG/SLC" />
-        <option name="profile" value="HFP/AG/TCA" />
+        <option name="profile" value="HID/HOS" />
+        <option name="profile" value="HOGP" />
         <option name="profile" value="L2CAP/LE" />
-        <option name="profile" value="SDP/SR" />
-        <option name="profile" value="SM/CEN/EKS" />
-        <option name="profile" value="SM/CEN/JW" />
-        <option name="profile" value="SM/CEN/KDU" />
-        <option name="profile" value="HOGP/RH" />
+        <option name="profile" value="SDP" />
+        <option name="profile" value="SM" />
     </test>
 
     <object type="module_controller"
diff --git a/android/pandora/server/configs/pts_bot_tests_config.json b/android/pandora/server/configs/pts_bot_tests_config.json
index 726e7cd..4949a6c 100644
--- a/android/pandora/server/configs/pts_bot_tests_config.json
+++ b/android/pandora/server/configs/pts_bot_tests_config.json
@@ -1,12 +1,5 @@
 {
   "pass": [
-    "A2DP/SRC/CC/BV-09-I",
-    "A2DP/SRC/REL/BV-01-I",
-    "A2DP/SRC/REL/BV-02-I",
-    "A2DP/SRC/SDP/BV-01-I",
-    "A2DP/SRC/SET/BV-01-I",
-    "A2DP/SRC/SET/BV-02-I",
-    "A2DP/SRC/SET/BV-04-I",
     "A2DP/SNK/AS/BV-01-I",
     "A2DP/SNK/AS/BV-02-I",
     "A2DP/SNK/CC/BV-01-I",
@@ -21,6 +14,13 @@
     "A2DP/SNK/SET/BV-02-I",
     "A2DP/SNK/SET/BV-03-I",
     "A2DP/SNK/SUS/BV-01-I",
+    "A2DP/SRC/CC/BV-09-I",
+    "A2DP/SRC/REL/BV-01-I",
+    "A2DP/SRC/REL/BV-02-I",
+    "A2DP/SRC/SDP/BV-01-I",
+    "A2DP/SRC/SET/BV-01-I",
+    "A2DP/SRC/SET/BV-02-I",
+    "A2DP/SRC/SET/BV-04-I",
     "AVCTP/CT/CCM/BV-03-C",
     "AVCTP/CT/CCM/BV-04-C",
     "AVCTP/TG/CCM/BV-03-C",
@@ -28,6 +28,36 @@
     "AVCTP/TG/FRA/BV-03-C",
     "AVCTP/TG/NFR/BI-01-C",
     "AVCTP/TG/NFR/BV-03-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BI-05-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BI-08-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BI-14-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BI-17-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BI-20-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BI-26-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BI-33-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-06-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-08-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-10-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-12-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-16-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-18-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-22-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-24-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-26-C",
+    "AVDTP/SNK/ACP/SIG/SMG/ESR04/BI-28-C",
+    "AVDTP/SNK/ACP/SIG/SYN/BV-01-C",
+    "AVDTP/SNK/ACP/TRA/BTR/BI-01-C",
+    "AVDTP/SNK/ACP/TRA/BTR/BV-02-C",
+    "AVDTP/SNK/INT/SIG/SMG/BI-30-C",
+    "AVDTP/SNK/INT/SIG/SMG/BI-35-C",
+    "AVDTP/SNK/INT/SIG/SMG/BI-36-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-05-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-07-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-09-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-15-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-25-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-28-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-31-C",
     "AVDTP/SRC/ACP/SIG/SMG/BI-05-C",
     "AVDTP/SRC/ACP/SIG/SMG/BI-08-C",
     "AVDTP/SRC/ACP/SIG/SMG/BI-14-C",
@@ -61,37 +91,12 @@
     "AVDTP/SRC/INT/SIG/SMG/BV-31-C",
     "AVDTP/SRC/INT/SIG/SYN/BV-05-C",
     "AVDTP/SRC/INT/TRA/BTR/BV-01-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-06-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-08-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-10-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-12-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-16-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-18-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-22-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-24-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-26-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BI-05-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BI-08-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BI-14-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BI-17-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BI-20-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BI-26-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BI-33-C",
-    "AVDTP/SNK/ACP/SIG/SMG/ESR04/BI-28-C",
-    "AVDTP/SNK/ACP/SIG/SYN/BV-01-C",
-    "AVDTP/SNK/ACP/TRA/BTR/BV-02-C",
-    "AVDTP/SNK/ACP/TRA/BTR/BI-01-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-05-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-07-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-09-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-15-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-25-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-28-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-3",
-    "AVDTP/SNK/INT/SIG/SMG/BI-30-C",
-    "AVDTP/SNK/INT/SIG/SMG/BI-35-C",
-    "AVDTP/SNK/INT/SIG/SMG/BI-3",
+    "AVRCP/CT/CEC/BV-02-I",
+    "AVRCP/CT/CRC/BV-02-I",
     "AVRCP/TG/CEC/BV-01-I",
+    "AVRCP/TG/CFG/BI-01-C",
+    "AVRCP/TG/CFG/BV-02-C",
+    "AVRCP/TG/CON/BV-04-C",
     "AVRCP/TG/CRC/BV-01-I",
     "AVRCP/TG/CRC/BV-02-I",
     "AVRCP/TG/ICC/BV-01-I",
@@ -101,26 +106,19 @@
     "AVRCP/TG/MDI/BV-02-C",
     "AVRCP/TG/MDI/BV-04-C",
     "AVRCP/TG/MDI/BV-05-C",
-    "AVRCP/TG/MPS/BV-02-C",
     "AVRCP/TG/MPS/BV-01-I",
+    "AVRCP/TG/MPS/BV-02-C",
     "AVRCP/TG/MPS/BV-02-I",
     "AVRCP/TG/MPS/BV-03-I",
     "AVRCP/TG/PTT/BV-01-I",
     "AVRCP/TG/PTT/BV-05-I",
-    "AVRCP/CT/CEC/BV-02-I",
-    "AVRCP/CT/CRC/BV-02-I",
-    "AVRCP/TG/CON/BV-04-C",
-    "AVRCP/TG/CFG/BV-02-C",
-    "AVRCP/TG/CFG/BI-01-C",
     "GAP/ADV/BV-01-C",
     "GAP/ADV/BV-02-C",
     "GAP/ADV/BV-03-C",
     "GAP/ADV/BV-04-C",
     "GAP/ADV/BV-05-C",
-    "GAP/CONN/DCEP/BV-01-C",
     "GAP/CONN/DCEP/BV-03-C",
     "GAP/CONN/NCON/BV-01-C",
-    "GAP/CONN/NCON/BV-02-C",
     "GAP/CONN/UCON/BV-01-C",
     "GAP/CONN/UCON/BV-02-C",
     "GAP/DISC/GENM/BV-02-C",
@@ -130,18 +128,19 @@
     "GAP/DISC/GENP/BV-04-C",
     "GAP/DISC/GENP/BV-05-C",
     "GAP/DISC/NONM/BV-01-C",
-    "GAP/DM/BON/BV-01-C",
     "GAP/DM/CON/BV-01-C",
     "GAP/DM/GIN/BV-01-C",
-    "GAP/DM/LEP/BV-01-C",
     "GAP/DM/LEP/BV-04-C",
-    "GAP/DM/LEP/BV-08-C",
     "GAP/DM/NAD/BV-01-C",
     "GAP/IDLE/GIN/BV-01-C",
     "GAP/IDLE/NAMP/BV-02-C",
     "GAP/MOD/CON/BV-01-C",
+    "GAP/MOD/GDIS/BV-01-C",
+    "GAP/MOD/GDIS/BV-02-C",
+    "GAP/MOD/NCON/BV-01-C",
     "GAP/MOD/NDIS/BV-01-C",
     "GAP/SEC/AUT/BV-11-C",
+    "GAP/SEC/AUT/BV-12-C",
     "GAP/SEC/SEM/BV-04-C",
     "GATT/CL/GAC/BV-01-C",
     "GATT/CL/GAD/BV-01-C",
@@ -211,13 +210,13 @@
     "GATT/SR/GAW/BI-12-C",
     "GATT/SR/UNS/BI-01-C",
     "GATT/SR/UNS/BI-02-C",
-    "HFP/AG/PSI/BV-03-C",
+    "HFP/AG/PSI/BV-05-I",
     "HID/HOS/DAT/BV-01-C",
     "HID/HOS/HCE/BV-01-I",
     "HID/HOS/HCE/BV-03-I",
     "HID/HOS/HCE/BV-04-I",
     "HID/HOS/HCR/BV-02-I",
-    "HID/HOS/HDT/BV-01-I",
+    "HID/HOS/HDT/BV-01-I ",
     "HID/HOS/HDT/BV-02-I",
     "HOGP/RH/HGCF/BV-01-I",
     "HOGP/RH/HGDC/BV-01-I",
@@ -240,9 +239,9 @@
     "HOGP/RH/HGRF/BV-01-I",
     "HOGP/RH/HGRF/BV-02-I",
     "HOGP/RH/HGRF/BV-04-I",
+    "HOGP/RH/HGRF/BV-05-I",
     "HOGP/RH/HGRF/BV-06-I",
     "HOGP/RH/HGRF/BV-08-I",
-    "HOGP/RH/HGRF/BV-05-I",
     "HOGP/RH/HGRF/BV-10-I",
     "HOGP/RH/HGRF/BV-12-I",
     "L2CAP/LE/CFC/BI-01-C",
@@ -261,9 +260,9 @@
     "L2CAP/LE/CFC/BV-19-C",
     "L2CAP/LE/CFC/BV-20-C",
     "L2CAP/LE/CFC/BV-21-C",
-    "L2CAP/LE/CPU/BV-02-C",
     "L2CAP/LE/CPU/BI-01-C",
     "L2CAP/LE/CPU/BI-02-C",
+    "L2CAP/LE/CPU/BV-02-C",
     "L2CAP/LE/REJ/BI-01-C",
     "SDP/SR/BRW/BV-02-C",
     "SDP/SR/SA/BI-01-C",
@@ -300,46 +299,50 @@
     "SDP/SR/SSA/BV-23-C",
     "SM/CEN/EKS/BI-01-C",
     "SM/CEN/EKS/BV-01-C",
-    "SM/CEN/JW/BV-05-C",
-    "SM/CEN/JW/BI-04-C",
     "SM/CEN/JW/BI-01-C",
-    "SM/CEN/KDU/BV-01-C",
+    "SM/CEN/JW/BI-04-C",
+    "SM/CEN/JW/BV-05-C",
+    "SM/CEN/KDU/BI-01-C",
     "SM/CEN/KDU/BV-04-C",
     "SM/CEN/KDU/BV-05-C",
-    "SM/CEN/KDU/BI-02-C",
     "SM/CEN/KDU/BV-06-C",
     "SM/CEN/KDU/BV-10-C",
-    "SM/CEN/KDU/BI-03-C",
     "SM/CEN/KDU/BV-11-C",
-    "SM/CEN/PROT/BV-01-C",
-    "SM/CEN/PKE/BV-04-C",
     "SM/CEN/PKE/BI-01-C",
     "SM/CEN/PKE/BI-02-C",
-    "SM/CEN/SCJW/BV-04-C",
+    "SM/CEN/PKE/BV-04-C",
+    "SM/CEN/PROT/BV-01-C",
     "SM/CEN/SCJW/BI-01-C",
+    "SM/CEN/SCJW/BV-04-C",
     "SM/CEN/SCPK/BI-01-C",
-    "SM/PER/PROT/BV-02-C",
-    "SM/PER/JW/BV-02-C",
-    "SM/PER/JW/BI-03-C",
-    "SM/PER/JW/BI-02-C",
-    "SM/PER/PKE/BV-02-C",
-    "SM/PER/PKE/BV-05-C",
-    "SM/PER/PKE/BI-03-C",
-    "SM/PER/EKS/BV-02-C",
     "SM/PER/EKS/BI-02-C",
+    "SM/PER/EKS/BV-02-C",
+    "SM/PER/JW/BI-02-C",
+    "SM/PER/JW/BI-03-C",
+    "SM/PER/JW/BV-02-C",
+    "SM/PER/KDU/BI-01-C",
     "SM/PER/KDU/BV-01-C",
     "SM/PER/KDU/BV-02-C",
     "SM/PER/KDU/BV-03-C",
     "SM/PER/KDU/BV-07-C",
     "SM/PER/KDU/BV-08-C",
     "SM/PER/KDU/BV-09-C",
-    "SM/PER/KDU/BI-01-C",
-    "SM/PER/SCJW/BV-03-C",
+    "SM/PER/PKE/BI-03-C",
+    "SM/PER/PKE/BV-02-C",
+    "SM/PER/PKE/BV-05-C",
+    "SM/PER/PROT/BV-02-C",
     "SM/PER/SCJW/BI-02-C",
-    "SM/PER/SCPK/BV-02-C",
-    "SM/PER/SCPK/BI-03-C"
+    "SM/PER/SCJW/BV-03-C",
+    "SM/PER/SCPK/BI-03-C",
+    "SM/PER/SCPK/BV-02-C"
   ],
   "skip": [
+    "A2DP/SNK/SDP/BV-02-I",
+    "A2DP/SNK/SET/BV-04-I",
+    "A2DP/SNK/SET/BV-05-I",
+    "A2DP/SNK/SET/BV-06-I",
+    "A2DP/SNK/SUS/BV-02-I",
+    "A2DP/SNK/SYN/BV-01-C",
     "A2DP/SRC/AS/BV-01-I",
     "A2DP/SRC/AS/BV-02-I",
     "A2DP/SRC/AS/BV-03-I",
@@ -350,12 +353,6 @@
     "A2DP/SRC/SUS/BV-01-I",
     "A2DP/SRC/SUS/BV-02-I",
     "A2DP/SRC/SYN/BV-02-I",
-    "A2DP/SNK/SDP/BV-02-I",
-    "A2DP/SNK/SET/BV-04-I",
-    "A2DP/SNK/SET/BV-05-I",
-    "A2DP/SNK/SET/BV-06-I",
-    "A2DP/SNK/SUS/BV-02-I",
-    "A2DP/SNK/SYN/BV-01-C",
     "AVCTP/CT/CCM/BV-01-C",
     "AVCTP/CT/CCM/BV-02-C",
     "AVCTP/CT/FRA/BV-01-C",
@@ -366,6 +363,19 @@
     "AVCTP/TG/CCM/BV-02-C",
     "AVCTP/TG/FRA/BV-02-C",
     "AVCTP/TG/NFR/BV-02-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BI-11-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BI-23-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-14-C",
+    "AVDTP/SNK/ACP/SIG/SMG/BV-20-C",
+    "AVDTP/SNK/ACP/SIG/SMG/ESR05/BV-14-C",
+    "AVDTP/SNK/ACP/SIG/SYN/BV-03-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-11-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-13-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-19-C",
+    "AVDTP/SNK/INT/SIG/SMG/BV-23-C",
+    "AVDTP/SNK/INT/SIG/SMG/ESR05/BV-13-C",
+    "AVDTP/SNK/INT/SIG/SYN/BV-02-C",
+    "AVDTP/SNK/INT/SIG/SYN/BV-04-C",
     "AVDTP/SRC/ACP/SIG/SMG/BI-11-C",
     "AVDTP/SRC/ACP/SIG/SMG/BI-23-C",
     "AVDTP/SRC/ACP/SIG/SMG/BV-08-C",
@@ -376,139 +386,129 @@
     "AVDTP/SRC/INT/SIG/SMG/BV-13-C",
     "AVDTP/SRC/INT/SIG/SMG/BV-23-C",
     "AVDTP/SRC/INT/SIG/SMG/ESR05/BV-13-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-14-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BV-20-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BI-11-C",
-    "AVDTP/SNK/ACP/SIG/SMG/BI-23-C",
-    "AVDTP/SNK/ACP/SIG/SMG/ESR05/BV-14-C",
-    "AVDTP/SNK/ACP/SIG/SYN/BV-03-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-11-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-13-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-19-C",
-    "AVDTP/SNK/INT/SIG/SMG/BV-23-C",
-    "AVDTP/SNK/INT/SIG/SMG/ESR05/BV-13-C",
-    "AVDTP/SNK/INT/SIG/SYN/BV-02-C",
-    "AVDTP/SNK/INT/SIG/SYN/BV-04-C",
+    "AVRCP/CT/CEC/BV-01-I",
+    "AVRCP/CT/CRC/BV-01-I",
+    "AVRCP/CT/PTH/BV-01-C",
+    "AVRCP/CT/PTT/BV-01-I",
+    "AVRCP/TG/MCN/CB/BI-01-C",
+    "AVRCP/TG/MCN/CB/BI-02-C",
+    "AVRCP/TG/MCN/CB/BI-03-C",
+    "AVRCP/TG/MCN/CB/BI-04-C",
+    "AVRCP/TG/MCN/CB/BI-05-C",
     "AVRCP/TG/MCN/CB/BV-01-I",
+    "AVRCP/TG/MCN/CB/BV-02-C",
     "AVRCP/TG/MCN/CB/BV-02-I",
     "AVRCP/TG/MCN/CB/BV-03-I",
     "AVRCP/TG/MCN/CB/BV-04-I",
+    "AVRCP/TG/MCN/CB/BV-05-C",
+    "AVRCP/TG/MCN/CB/BV-06-C",
     "AVRCP/TG/MCN/CB/BV-06-I",
+    "AVRCP/TG/MCN/CB/BV-08-C",
+    "AVRCP/TG/MCN/CB/BV-09-C",
+    "AVRCP/TG/MCN/NP/BI-01-C",
     "AVRCP/TG/MCN/NP/BV-01-I",
+    "AVRCP/TG/MCN/NP/BV-02-C",
     "AVRCP/TG/MCN/NP/BV-04-I",
     "AVRCP/TG/MCN/NP/BV-05-I",
+    "AVRCP/TG/MCN/NP/BV-06-C",
     "AVRCP/TG/MCN/NP/BV-06-I",
+    "AVRCP/TG/MCN/NP/BV-07-C",
+    "AVRCP/TG/MCN/NP/BV-09-C",
+    "AVRCP/TG/MPS/BI-01-C",
+    "AVRCP/TG/MPS/BI-02-C",
+    "AVRCP/TG/MPS/BV-04-C",
+    "AVRCP/TG/MPS/BV-06-C",
+    "AVRCP/TG/MPS/BV-09-C",
+    "AVRCP/TG/NFY/BI-01-C",
     "AVRCP/TG/NFY/BV-02-C",
     "AVRCP/TG/NFY/BV-04-C",
     "AVRCP/TG/NFY/BV-06-C",
     "AVRCP/TG/NFY/BV-07-C",
-    "AVRCP/TG/NFY/BI-01-C",
-    "AVRCP/TG/MPS/BI-01-C",
-    "AVRCP/TG/MPS/BV-04-C",
-    "AVRCP/TG/MPS/BI-02-C",
-    "AVRCP/TG/MPS/BV-06-C",
-    "AVRCP/TG/MPS/BV-09-C",
-    "AVRCP/TG/MCN/CB/BV-02-C",
-    "AVRCP/TG/MCN/CB/BI-01-C",
-    "AVRCP/TG/MCN/CB/BV-05-C",
-    "AVRCP/TG/MCN/CB/BV-06-C",
-    "AVRCP/TG/MCN/CB/BI-04-C",
-    "AVRCP/TG/MCN/CB/BI-02-C",
-    "AVRCP/TG/MCN/CB/BV-08-C",
-    "AVRCP/TG/MCN/CB/BV-09-C",
-    "AVRCP/TG/MCN/CB/BI-05-C",
-    "AVRCP/TG/MCN/CB/BI-03-C",
-    "AVRCP/TG/MCN/NP/BV-02-C",
-    "AVRCP/TG/MCN/NP/BI-01-C",
-    "AVRCP/TG/MCN/NP/BV-06-C",
-    "AVRCP/TG/MCN/NP/BV-07-C",
-    "AVRCP/TG/MCN/NP/BV-09-C",
     "AVRCP/TG/RCR/BV-02-C",
     "AVRCP/TG/RCR/BV-04-C",
-    "AVRCP/CT/PTT/BV-01-I",
-    "AVRCP/CT/PTH/BV-01-C",
-    "AVRCP/CT/CRC/BV-01-I",
-    "AVRCP/CT/CEC/BV-01-I",
-    "GAP/DM/LEP/BV-11-C",
-    "GAP/DM/LEP/BV-10-C",
+    "GAP/BOND/BON/BV-01-C",
+    "GAP/BOND/BON/BV-02-C",
+    "GAP/BOND/BON/BV-03-C",
+    "GAP/BOND/BON/BV-04-C",
+    "GAP/BOND/NBON/BV-01-C",
+    "GAP/BOND/NBON/BV-02-C",
     "GAP/BOND/NBON/BV-03-C",
-    "GAP/SEC/AUT/BV-02-C",
-    "GAP/SEC/AUT/BV-21-C",
-    "GAP/IDLE/NAMP/BV-01-C",
-    "GAP/SEC/SEM/BI-01-C",
+    "GAP/CONN/ACEP/BV-01-C",
+    "GAP/CONN/CPUP/BV-01-C",
+    "GAP/CONN/CPUP/BV-02-C",
+    "GAP/CONN/CPUP/BV-03-C",
+    "GAP/CONN/CPUP/BV-04-C",
+    "GAP/CONN/CPUP/BV-05-C",
+    "GAP/CONN/CPUP/BV-06-C",
+    "GAP/CONN/CPUP/BV-08-C",
     "GAP/CONN/DCEP/BV-01-C",
     "GAP/CONN/GCEP/BV-01-C",
     "GAP/CONN/GCEP/BV-02-C",
-    "GAP/CONN/CPUP/BV-06-C",
-    "GAP/CONN/CPUP/BV-08-C",
-    "GAP/BOND/BON/BV-04-C",
-    "GAP/SEC/SEM/BV-06-C",
-    "GAP/SEC/SEM/BI-10-C",
-    "GAP/DISC/NONM/BV-02-C",
-    "GAP/SEC/AUT/BV-17-C",
-    "GAP/DM/LEP/BV-06-C",
-    "GAP/SEC/SEM/BV-10-C",
-    "GAP/DISC/GENM/BV-01-C",
-    "GAP/CONN/CPUP/BV-05-C",
-    "GAP/SEC/SEM/BV-38-C",
-    "GAP/CONN/CPUP/BV-01-C",
-    "GAP/BOND/BON/BV-02-C",
-    "GAP/SEC/SEM/BV-29-C",
-    "GAP/BOND/NBON/BV-02-C",
-    "GAP/IDLE/DED/BV-02-C",
-    "GAP/SEC/SEM/BV-21-C",
-    "GAP/SEC/SEM/BV-08-C",
-    "GAP/CONN/CPUP/BV-02-C",
-    "GAP/SEC/SEM/BV-02-C",
-    "GAP/SEC/SEM/BV-41-C",
-    "GAP/SEC/AUT/BV-20-C",
-    "GAP/DM/LEP/BV-09-C",
-    "GAP/SEC/AUT/BV-24-C",
-    "GAP/SEC/SEM/BI-09-C",
-    "GAP/SEC/SEM/BV-28-C",
-    "GAP/SEC/AUT/BV-23-C",
-    "GAP/SEC/AUT/BV-22-C",
-    "GAP/SEC/SEM/BV-26-C",
-    "GAP/SEC/SEM/BV-40-C",
-    "GAP/SEC/SEM/BV-42-C",
-    "GAP/SEC/SEM/BV-27-C",
-    "GAP/SEC/SEM/BI-05-C",
-    "GAP/SEC/SEM/BV-37-C",
-    "GAP/SEC/SEM/BV-09-C",
-    "GAP/CONN/CPUP/BV-04-C",
-    "GAP/SEC/SEM/BI-18-C",
-    "GAP/DM/LEP/BV-02-C",
-    "GAP/DM/LEP/BV-07-C",
-    "GAP/CONN/CPUP/BV-03-C",
-    "GAP/BOND/BON/BV-03-C",
-    "GAP/SEC/SEM/BI-08-C",
-    "GAP/DM/NCON/BV-01-C",
-    "GAP/DM/LEP/BV-05-C",
-    "GAP/SEC/AUT/BV-13-C",
-    "GAP/SEC/SEM/BV-39-C",
-    "GAP/SEC/SEM/BI-06-C",
-    "GAP/BOND/NBON/BV-01-C",
-    "GAP/SEC/SEM/BI-15-C",
-    "GAP/SEC/SEM/BV-23-C",
-    "GAP/SEC/SEM/BV-05-C",
-    "GAP/SEC/SEM/BI-02-C",
-    "GAP/SEC/SEM/BV-44-C",
-    "GAP/BOND/BON/BV-01-C",
-    "GAP/SEC/SEM/BV-22-C",
-    "GAP/SEC/SEM/BV-43-C",
-    "GAP/SEC/SEM/BV-07-C",
-    "GAP/SEC/AUT/BV-14-C",
-    "GAP/SEC/AUT/BV-18-C",
-    "GAP/SEC/SEM/BV-24-C",
-    "GAP/SEC/AUT/BV-19-C",
-    "GAP/DM/NAD/BV-02-C",
-    "GAP/SEC/SEM/BI-04-C",
-    "GAP/CONN/TERM/BV-01-C",
-    "GAP/CONN/ACEP/BV-01-C",
-    "GAP/DM/BON/BV-01-C",
     "GAP/CONN/NCON/BV-02-C",
-    "GAP/DM/LEP/BV-08-C",
+    "GAP/CONN/TERM/BV-01-C",
+    "GAP/DISC/GENM/BV-01-C",
+    "GAP/DISC/NONM/BV-02-C",
+    "GAP/DM/BON/BV-01-C",
     "GAP/DM/LEP/BV-01-C",
+    "GAP/DM/LEP/BV-02-C",
+    "GAP/DM/LEP/BV-05-C",
+    "GAP/DM/LEP/BV-06-C",
+    "GAP/DM/LEP/BV-07-C",
+    "GAP/DM/LEP/BV-08-C",
+    "GAP/DM/LEP/BV-09-C",
+    "GAP/DM/LEP/BV-10-C",
+    "GAP/DM/LEP/BV-11-C",
+    "GAP/DM/NAD/BV-02-C",
+    "GAP/DM/NCON/BV-01-C",
+    "GAP/IDLE/DED/BV-02-C",
+    "GAP/IDLE/NAMP/BV-01-C",
+    "GAP/SEC/AUT/BV-02-C",
+    "GAP/SEC/AUT/BV-13-C",
+    "GAP/SEC/AUT/BV-14-C",
+    "GAP/SEC/AUT/BV-17-C",
+    "GAP/SEC/AUT/BV-18-C",
+    "GAP/SEC/AUT/BV-19-C",
+    "GAP/SEC/AUT/BV-20-C",
+    "GAP/SEC/AUT/BV-21-C",
+    "GAP/SEC/AUT/BV-22-C",
+    "GAP/SEC/AUT/BV-23-C",
+    "GAP/SEC/AUT/BV-24-C",
+    "GAP/SEC/SEM/BI-01-C",
+    "GAP/SEC/SEM/BI-02-C",
+    "GAP/SEC/SEM/BI-04-C",
+    "GAP/SEC/SEM/BI-05-C",
+    "GAP/SEC/SEM/BI-06-C",
+    "GAP/SEC/SEM/BI-08-C",
+    "GAP/SEC/SEM/BI-09-C",
+    "GAP/SEC/SEM/BI-10-C",
+    "GAP/SEC/SEM/BI-15-C",
+    "GAP/SEC/SEM/BI-18-C",
+    "GAP/SEC/SEM/BV-02-C",
+    "GAP/SEC/SEM/BV-05-C",
+    "GAP/SEC/SEM/BV-06-C",
+    "GAP/SEC/SEM/BV-07-C",
+    "GAP/SEC/SEM/BV-08-C",
+    "GAP/SEC/SEM/BV-09-C",
+    "GAP/SEC/SEM/BV-10-C",
+    "GAP/SEC/SEM/BV-21-C",
+    "GAP/SEC/SEM/BV-22-C",
+    "GAP/SEC/SEM/BV-23-C",
+    "GAP/SEC/SEM/BV-24-C",
+    "GAP/SEC/SEM/BV-26-C",
+    "GAP/SEC/SEM/BV-27-C",
+    "GAP/SEC/SEM/BV-28-C",
+    "GAP/SEC/SEM/BV-29-C",
+    "GAP/SEC/SEM/BV-37-C",
+    "GAP/SEC/SEM/BV-38-C",
+    "GAP/SEC/SEM/BV-39-C",
+    "GAP/SEC/SEM/BV-40-C",
+    "GAP/SEC/SEM/BV-41-C",
+    "GAP/SEC/SEM/BV-42-C",
+    "GAP/SEC/SEM/BV-43-C",
+    "GAP/SEC/SEM/BV-44-C",
+    "GATT/CL/GAI/BV-01-C",
+    "GATT/CL/GAN/BV-01-C",
+    "GATT/CL/GAN/BV-02-C",
     "GATT/CL/GAR/BI-04-C",
     "GATT/CL/GAR/BI-05-C",
     "GATT/CL/GAR/BI-10-C",
@@ -516,6 +516,10 @@
     "GATT/CL/GAR/BI-16-C",
     "GATT/CL/GAR/BI-17-C",
     "GATT/CL/GAR/BV-03-C",
+    "GATT/CL/GAS/BV-01-C",
+    "GATT/CL/GAS/BV-03-C",
+    "GATT/CL/GAT/BV-01-C",
+    "GATT/CL/GAT/BV-02-C",
     "GATT/CL/GAW/BI-05-C",
     "GATT/CL/GAW/BI-06-C",
     "GATT/CL/GAW/BI-12-C",
@@ -578,17 +582,24 @@
     "L2CAP/LE/CPU/BV-01-C",
     "L2CAP/LE/REJ/BI-02-C",
     "SM/CEN/PKE/BV-01-C",
+    "SM/CEN/SCCT/BV-03-C",
+    "SM/CEN/SCCT/BV-05-C",
+    "SM/CEN/SCCT/BV-07-C",
+    "SM/CEN/SCCT/BV-09-C",
     "SM/CEN/SCJW/BV-01-C",
     "SM/CEN/SCPK/BI-02-C",
     "SM/CEN/SCPK/BV-01-C",
     "SM/CEN/SCPK/BV-04-C",
-    "SM/PER/SCJW/BV-02-C",
-    "SM/PER/SCPK/BI-04-C",
-    "SM/PER/SCPK/BV-03-C",
+    "SM/CEN/SIP/BV-02-C",
     "SM/PER/SCCT/BV-04-C",
     "SM/PER/SCCT/BV-06-C",
     "SM/PER/SCCT/BV-08-C",
-    "SM/PER/SCCT/BV-10-C"
+    "SM/PER/SCCT/BV-10-C",
+    "SM/PER/SCJW/BV-02-C",
+    "SM/PER/SCPK/BI-04-C",
+    "SM/PER/SCPK/BV-03-C",
+    "SM/PER/SIE/BV-01-C",
+    "SM/PER/SIP/BV-01-C"
   ],
   "ics": {
     "TSPC_4.0HCI_1a_2": true,