diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index c346847..206b58f 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -162,7 +162,6 @@
 }
 
 void RenderThread::initThreadLocals() {
-    HardwareBitmapUploader::initialize();
     setupFrameInterval();
     initializeChoreographer();
     mEglManager = new EglManager();
@@ -391,12 +390,10 @@
     if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL) {
         std::thread eglInitThread([]() { eglGetDisplay(EGL_DEFAULT_DISPLAY); });
         eglInitThread.detach();
+    } else {
+        requireVkContext();
     }
-    // TODO: uncomment only after http://b/135536511 is fixed.
-    // else {
-    //    uint32_t apiVersion;
-    //    vkEnumerateInstanceVersion(&apiVersion);
-    //}
+    HardwareBitmapUploader::initialize();
 }
 
 } /* namespace renderthread */