diff --git a/biometrics/fingerprint/V2_1/target_profiling/Android.mk b/biometrics/fingerprint/V2_1/target_profiling/Android.mk
index bc816fe..70ab2a2 100644
--- a/biometrics/fingerprint/V2_1/target_profiling/Android.mk
+++ b/biometrics/fingerprint/V2_1/target_profiling/Android.mk
@@ -18,6 +18,6 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsHalBioFingerprintV2_1TargetProfiling
+LOCAL_MODULE := VtsHalBiometricsFingerprintV2_1TargetProfiling
 VTS_CONFIG_SRC_DIR := testcases/hal/biometrics/fingerprint/V2_1/target_profiling
 include test/vts/tools/build/Android.host_config.mk
diff --git a/biometrics/fingerprint/V2_1/target_profiling/AndroidTest.xml b/biometrics/fingerprint/V2_1/target_profiling/AndroidTest.xml
index c466b8d..9638452 100644
--- a/biometrics/fingerprint/V2_1/target_profiling/AndroidTest.xml
+++ b/biometrics/fingerprint/V2_1/target_profiling/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for VTS VtsHalBioFingerprintV2_1TargetProfiling test cases">
+<configuration description="Config for VTS VtsHalBiometricsFingerprintV2_1TargetProfiling test cases">
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false"/>
         <option name="push-group" value="HalHidlTargetProfilingTest.push"/>
@@ -23,7 +23,7 @@
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsHalBioFingerprintV2_1TargetProfiling"/>
+        <option name="test-module-name" value="VtsHalBiometricsFingerprintV2_1TargetProfiling"/>
         <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalBiometricsFingerprintV2_1TargetTest/VtsHalBiometricsFingerprintV2_1TargetTest"/>
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalBiometricsFingerprintV2_1TargetTest/VtsHalBiometricsFingerprintV2_1TargetTest"/>
         <option name="binary-test-type" value="hal_hidl_gtest"/>
diff --git a/camera/provider/V2_4/target_profiling/AndroidTest.xml b/camera/provider/V2_4/target_profiling/AndroidTest.xml
index 4355ec1..4e213a0 100644
--- a/camera/provider/V2_4/target_profiling/AndroidTest.xml
+++ b/camera/provider/V2_4/target_profiling/AndroidTest.xml
@@ -34,8 +34,6 @@
         <option name="test-module-name" value="VtsHalCameraProviderV2_4TargetProfiling"/>
         <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest"/>
         <option name="binary-test-type" value="hal_hidl_gtest"/>
-        <option name="binary-test-disable-framework" value="true"/>
-        <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.camera.provider@2.4"/>
         <option name="skip-on-64bit-abi" value="true"/>
diff --git a/graphics/composer/V2_1/target/AndroidTest.xml b/graphics/composer/V2_1/target/AndroidTest.xml
index 9db34c2..611da9c 100644
--- a/graphics/composer/V2_1/target/AndroidTest.xml
+++ b/graphics/composer/V2_1/target/AndroidTest.xml
@@ -27,6 +27,6 @@
         <option name="binary-test-disable-framework" value="true"/>
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.graphics.composer@2.1"/>
-        <option name="test-timeout" value="1m"/>
+        <option name="test-timeout" value="2m"/>
     </test>
 </configuration>
diff --git a/media/omx/V1_0/host/AndroidTest.xml b/media/omx/V1_0/host/AndroidTest.xml
index 72478c8..5ba37e0 100644
--- a/media/omx/V1_0/host/AndroidTest.xml
+++ b/media/omx/V1_0/host/AndroidTest.xml
@@ -86,6 +86,6 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="hal-hidl-package-name" value="android.hardware.media.omx@1.0"/>
         <option name="precondition-lshal" value="android.hardware.media.omx@1.0"/>
-        <option name="test-timeout" value="30m"/>
+        <option name="test-timeout" value="40m"/>
     </test>
 </configuration>
diff --git a/media/omx/V1_0/host/VtsHalMediaOmxV1_0HostTest.py b/media/omx/V1_0/host/VtsHalMediaOmxV1_0HostTest.py
index f52bf36..2f4d6e9 100644
--- a/media/omx/V1_0/host/VtsHalMediaOmxV1_0HostTest.py
+++ b/media/omx/V1_0/host/VtsHalMediaOmxV1_0HostTest.py
@@ -28,34 +28,37 @@
 class VtsHalMediaOmxV1_0Host(hal_hidl_gtest.HidlHalGTest):
     """Host test class to run the Media_Omx HAL."""
 
+    COMPONENT_TEST = "ComponentHidlTest"
     AUDIO_ENC_TEST = "AudioEncHidlTest"
     AUDIO_DEC_TEST = "AudioDecHidlTest"
     VIDEO_ENC_TEST = "VideoEncHidlTest"
     VIDEO_DEC_TEST = "VideoDecHidlTest"
 
-    # Components and Roles which will be skipped.
-    blacklist_components = ["OMX.qcom.video.decoder.avc",
-                            "OMX.qcom.video.encoder.avc.secure",
-                            "OMX.qcom.video.decoder.avc.secure",
-                            "OMX.qcom.video.decoder.mpeg4.secure",
-                            "OMX.qcom.video.decoder.mpeg4",
-                            "OMX.qcom.video.decoder.h263",
-                            "OMX.qcom.video.decoder.hevc",
-                            "OMX.qcom.video.decoder.mpeg2.secure",
-                            "OMX.qcom.video.decoder.mpeg2",
-                            "OMX.qcom.video.decoder.vp8",
-                            "OMX.qcom.video.decoder.vp9",
-                            "OMX.qcom.video.decoder.hevc.secure",
-                            "OMX.qcom.video.decoder.vp9.secure",
-                            "OMX.qcom.video.decoder.vp8.secure"]
-    blacklist_roles = ["video_encoder.avc",
-                       "video_decoder.avc",
+    # Roles we want to test.
+    whitelist_roles = ["audio_encoder.aac",
+                       "audio_encoder.amrnb",
+                       "audio_encoder.amrwb",
+                       "audio_encoder.flac",
+                       "audio_decoder.aac",
+                       "audio_decoder.amrnb",
+                       "audio_decoder.amrwb",
+                       "audio_decoder.g711alaw",
+                       "audio_decoder.g711mlaw",
+                       "audio_decoder.gsm",
+                       "audio_decoder.mp3",
+                       "audio_decoder.opus",
+                       "audio_decoder.raw",
+                       "audio_decoder.vorbis",
                        "video_encoder.avc",
-                       "video_decoder.mpeg4",
-                       "video_decoder.vp8",
+                       "video_encoder.h263",
+                       "video_encoder.mpeg4",
+                       "video_encoder.vp8",
+                       "video_encoder.vp9",
+                       "video_decoder.avc",
                        "video_decoder.h263",
                        "video_decoder.hevc",
-                       "video_decoder.mpeg2",
+                       "video_decoder.mpeg4",
+                       "video_decoder.vp8",
                        "video_decoder.vp9"]
 
     def CreateTestCases(self):
@@ -102,7 +105,7 @@
             test_suite = gtest_case.GetFullName()
             for component, roles in self.components.iteritems():
                 for role in roles:
-                    if component in self.blacklist_components and role in self.blacklist_roles:
+                    if not self.COMPONENT_TEST in test_suite and not role in self.whitelist_roles:
                         continue
                     if self.AUDIO_ENC_TEST in test_suite and not "audio_encoder" in role:
                         continue
diff --git a/wifi/V1_0/target/base/AndroidTest.xml b/wifi/V1_0/target/base/AndroidTest.xml
index 011d47c..86fd502 100644
--- a/wifi/V1_0/target/base/AndroidTest.xml
+++ b/wifi/V1_0/target/base/AndroidTest.xml
@@ -24,6 +24,8 @@
         <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalWifiV1_0TargetTest/VtsHalWifiV1_0TargetTest" />
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalWifiV1_0TargetTest/VtsHalWifiV1_0TargetTest" />
         <option name="binary-test-type" value="hal_hidl_gtest"/>
+        <option name="binary-test-disable-framework" value="true"/>
+        <option name="binary-test-stop-native-servers" value="true"/>
         <option name="precondition-lshal" value="android.hardware.wifi@1.0"/>
         <option name="test-timeout" value="10m"/>
     </test>
diff --git a/wifi/V1_0/target_profiling/base/AndroidTest.xml b/wifi/V1_0/target_profiling/base/AndroidTest.xml
index 9f11856..ff359a4 100644
--- a/wifi/V1_0/target_profiling/base/AndroidTest.xml
+++ b/wifi/V1_0/target_profiling/base/AndroidTest.xml
@@ -27,6 +27,8 @@
         <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalWifiV1_0TargetTest/VtsHalWifiV1_0TargetTest" />
         <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalWifiV1_0TargetTest/VtsHalWifiV1_0TargetTest" />
         <option name="binary-test-type" value="hal_hidl_gtest"/>
+        <option name="binary-test-disable-framework" value="true"/>
+        <option name="binary-test-stop-native-servers" value="true"/>
         <option name="enable-profiling" value="true"/>
         <option name="precondition-lshal" value="android.hardware.wifi@1.0"/>
         <option name="test-timeout" value="10m"/>