diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 33ffd33..638a01d 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2113
+BUILD=2114
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.
diff --git a/src/win32/base/uninstall_helper.cc b/src/win32/base/uninstall_helper.cc
index 0b7786d..b59e563 100644
--- a/src/win32/base/uninstall_helper.cc
+++ b/src/win32/base/uninstall_helper.cc
@@ -79,6 +79,10 @@
 // http://msdn.microsoft.com/en-us/library/ms724872(VS.85).aspx
 const DWORD kMaxValueNameLength = 16383;
 
+// Timeout value used by a work around against b/5765783.
+// Note that the following timeout threshold is not well tested.
+// TODO(yukawa): Investigate the best timeout threshold. b/6165722
+const uint32 kWaitForAsmCacheReadyEventTimeout = 10000;  // 10 sec.
 
 // Converts an unsigned integer to a wide string.
 wstring utow(unsigned int i) {
@@ -352,6 +356,10 @@
     return false;
   }
 
+  // A work around against b/5765783.
+  if (!ImeUtil::WaitForAsmCacheReady(kWaitForAsmCacheReadyEventTimeout)) {
+    DLOG(ERROR) << "ImeUtil::WaitForAsmCacheReady failed.";
+  }
 
   // Broadcasting WM_INPUTLANGCHANGEREQUEST so that existing process in the
   // current session will change their input method to |hkl|. This mechanism