diff --git a/betocq/app/src/main/AndroidManifestMicroxr.xml b/betocq/app/src/main/AndroidManifestMicroxr.xml
new file mode 100644
index 0000000..f361d3f
--- /dev/null
+++ b/betocq/app/src/main/AndroidManifestMicroxr.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.mobly.snippet.microxr">
+  <!-- Declare the minimum Android SDK version and internet permission,
+       which are required by Mobly Snippet Lib since it uses network socket. -->
+  <uses-sdk
+      android:minSdkVersion="16"
+      android:targetSdkVersion="24"/>
+  <uses-feature android:name="android.hardware.camera.any" />
+  <uses-permission android:name="android.permission.INJECT_EVENTS" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.CAMERA" />
+  <uses-permission android:name="android.permission.RECORD_AUDIO" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+</manifest>
diff --git a/betocq/nearby_connection/betocq_aqt_test_suite.py b/betocq/nearby_connection/betocq_aqt_test_suite.py
index 046ef90..37bbd00 100644
--- a/betocq/nearby_connection/betocq_aqt_test_suite.py
+++ b/betocq/nearby_connection/betocq_aqt_test_suite.py
@@ -42,7 +42,7 @@
 # increment this version number when adding new tests or changing the config
 # parameters of existing tests.
 # LINT.IfChange(suite_version)
-_SUITE_VERSION = '5'
+_SUITE_VERSION = '6'
 # LINT.ThenChange()
 
 
@@ -77,11 +77,6 @@ def _assert_config_parameters(self, config):
           not test_params.wifi_dfs_5g_ssid, 'wifi_dfs_5g_ssid is not set'
       )
 
-    asserts.abort_all_if(
-        not test_params.abort_all_if_any_ap_not_ready,
-        'do not change testbed parameters, abort_all_if_any_ap_not_ready is'
-        ' expected to be True',
-    )
     asserts.abort_all_if(
         test_params.skip_default_flag_override,
         'do not change testbed parameters, skip_default_flag_override is'
diff --git a/betocq/nearby_connection/utils.py b/betocq/nearby_connection/utils.py
index e7918b7..4cef15a 100644
--- a/betocq/nearby_connection/utils.py
+++ b/betocq/nearby_connection/utils.py
@@ -115,7 +115,10 @@ def _report_error(error_message: str) -> None:
         wifi_dfs_5g_ssid,
         freq_5g_dfs,
     )
-    wifi_scan_results_list = setup_utils.check_wifi_env(advertiser)
+    wifi_scan_results_list = setup_utils.check_wifi_env(
+        advertiser,
+        wifi_scan_wait_time_sec=setup_utils.WIFI_SCAN_WAIT_TIME_SEC * 2
+    )
     if wifi_scan_results_list:
       freq_by_ssids = {
           result['SSID']: result['Frequency']
diff --git a/betocq/setup_utils.py b/betocq/setup_utils.py
index 125e67d..841277f 100644
--- a/betocq/setup_utils.py
+++ b/betocq/setup_utils.py
@@ -76,7 +76,7 @@
         \s+
         (\d+)            # Captures Frequency
         \s+
-        [-\d.]+          # Matches RSSI (skipped)
+        [-\d()./:]+      # Matches RSSI (skipped)
         \s+
         [\d.]+           # Matches Age (skipped)
         \s*
@@ -738,11 +738,13 @@ def _parse_wifi_scan(scan_results: Iterable[str]) -> Sequence[dict[str, Any]]:
 
 def check_wifi_env(
     ad: android_device.AndroidDevice,
+    wifi_scan_wait_time_sec: int = WIFI_SCAN_WAIT_TIME_SEC,
 ) -> Sequence[dict[str, Any]] | None:
   """Let WI-FI scan and get scan results. Check if the environment is clean.
 
   Args:
     ad: AndroidDevice, Mobly Android Device.
+    wifi_scan_wait_time_sec: The time to wait for Wi-Fi scan to complete.
 
   Returns:
     Wi-Fi scan results as a list of SSID and Frequency or None if it fails to
@@ -754,7 +756,7 @@ def check_wifi_env(
   # Start wifi scan.
   try:
     ad.adb.shell('cmd wifi start-scan')
-    time.sleep(WIFI_SCAN_WAIT_TIME_SEC)
+    time.sleep(wifi_scan_wait_time_sec)
   except adb.AdbError:
     ad.log.warning('Failed to start wifi scan.', exc_info=True)
     return None
diff --git a/betocq/version.py b/betocq/version.py
index a914d5a..24b0b6a 100644
--- a/betocq/version.py
+++ b/betocq/version.py
@@ -35,3 +35,4 @@
 # '2.6.1': ('Add XCC test cases for AQT.'
 #          'Update the snippet SDK version to 35 and other bug fixes.')
 # '2.6.2': ('Optimize tests for AQT and fix some bugs.')
+# '2.6.3': ('Fix some bugs.')