Merge "Update test OWNERS."
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/DevicePickerActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/DevicePickerActivity.java
index dc6851b..a5dea4b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/DevicePickerActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/DevicePickerActivity.java
@@ -123,7 +123,6 @@
     }
 
     private void scan() {
-        mBluetoothAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, 60);
         populatePairedDevices();
         mNewDevicesAdapter.clear();
         if (mBluetoothAdapter.isDiscovering()) {
diff --git a/tests/media/src/android/mediav2/cts/EncodeDecodeAccuracyTest.java b/tests/media/src/android/mediav2/cts/EncodeDecodeAccuracyTest.java
index 5586d95..528b417 100644
--- a/tests/media/src/android/mediav2/cts/EncodeDecodeAccuracyTest.java
+++ b/tests/media/src/android/mediav2/cts/EncodeDecodeAccuracyTest.java
@@ -414,13 +414,7 @@
         mEGLWindowOutSurface = new OutputSurface(mWidth, mHeight);
         mSurface = mEGLWindowOutSurface.getSurface();
         ArrayList<MediaFormat> formats = new ArrayList<>();
-
-        // TODO (b/193191868) Some decoders do not advertise profile and levels for vp8
-        // so do not filter codecs based on format for vp8
-        if (!mMime.equals(MediaFormat.MIMETYPE_VIDEO_VP8)) {
-            formats.add(format);
-        }
-
+        formats.add(format);
         ArrayList<String> listOfDecoders =
                 CodecDecoderTestBase.selectCodecs(mMime, formats, null, false);
         assertTrue("no suitable codecs found for : " + format.toString(),