diff --git a/src/android/src/com/google/android/inputmethod/japanese/userdictionary/UserDictionaryToolActivity.java b/src/android/src/com/google/android/inputmethod/japanese/userdictionary/UserDictionaryToolActivity.java
index ea8e674c5..e7fbb63d3 100644
--- a/src/android/src/com/google/android/inputmethod/japanese/userdictionary/UserDictionaryToolActivity.java
+++ b/src/android/src/com/google/android/inputmethod/japanese/userdictionary/UserDictionaryToolActivity.java
@@ -247,7 +247,7 @@ private void handleImportData() {
       return;
     }
 
-    if (!importUri.getScheme().equals("file")) {
+    if (!"file".equals(importUri.getScheme())) {
       // Not a file.
       toastManager.showMessageShortly(
           R.string.user_dictionary_tool_error_import_source_invalid_scheme);
@@ -255,7 +255,7 @@ private void handleImportData() {
     }
 
     // Need to read data from the file.
-    if (getIntent().getType().equals("application/zip")) {
+    if ("application/zip".equals(getIntent().getType())) {
       handleZipImportData(importUri.getPath());
     } else {
       handleTextImportData(importUri.getPath());
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index c36d47387..207c8e4f7 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2531
+BUILD=2532
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.