diff --git a/overlay/jordan/packages/apps/Camera/res/values/config.xml b/overlay/jordan/packages/apps/Camera/res/values/config.xml
index a6efecd..0469b05 100644
--- a/overlay/jordan/packages/apps/Camera/res/values/config.xml
+++ b/overlay/jordan/packages/apps/Camera/res/values/config.xml
@@ -16,12 +16,13 @@
 ** limitations under the License.
 */
 -->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
 <resources>
 
-	<!-- Wide media profile available -->
-	<bool name="supportsWideProfile">true</bool>
+    <!-- Wide media profile available -->
+    <bool name="supportsWideProfile">true</bool>
+
+    <!-- Autofocus parameters -->
+    <string name="touchFocusParameter">mot-areas-to-focus</string>
+    <bool name="touchFocusNeedsRect">true</bool>
 
 </resources>
diff --git a/overlay/olympus/packages/apps/CMParts/res/values/config.xml b/overlay/olympus/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index f49f9fc..0000000
--- a/overlay/olympus/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">true</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
index d6c047a..61a9d3b 100644
--- a/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
+++ b/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
@@ -22,17 +22,17 @@
          <string name="lockscreen_carrier_default"></string>
 
     <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
-    <string name="power_dialog">Параметры планшета</string>
+    <string name="power_dialog">Параметры планшетного ПК</string>
 
     <!-- Button to reboot the phone, within the Phone Options dialog -->
     <string name="reboot_system">Перезагрузить</string>
 
     <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will be a confirmation dialog.  This is the message. -->
-    <string name="shutdown_confirm">Планшет будет выключен.</string>
+    <string name="shutdown_confirm">Планшетный ПК будет выключен.</string>
 
     <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the phone, there will be a confirmation dialog.  This is the message. -->
-    <string name="reboot_confirm">Планшет будет перезагружен.</string>
+    <string name="reboot_confirm">Планшетный ПК будет перезагружен.</string>
 
     <!-- Title of the Global Actions Dialog -->
-    <string name="global_actions">Параметры планшета</string>
+    <string name="global_actions">Параметры планшетного ПК</string>
 </resources>
diff --git a/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
index 9e92bb3..c5ded5d 100644
--- a/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
+++ b/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <!-- Main settings screen, setting title for the user to go into the About phone screen -->
-    <string name="about_settings">О планшете</string>
+    <string name="about_settings">О планшетном ПК</string>
 
 </resources>
 
diff --git a/prebuilt/common/etc/spn-conf.xml b/prebuilt/common/etc/spn-conf.xml
index 633a1a2..32b6f1a 100644
--- a/prebuilt/common/etc/spn-conf.xml
+++ b/prebuilt/common/etc/spn-conf.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <spnOverrides>
+  <!-- Japan -->
+  <spnOverride numeric="44020" spn="SoftBank"/>
   <!-- Hong Kong -->
+  <spnOverride numeric="45406" spn="SmarTone" />
   <spnOverride numeric="45412" spn="中國移動" />
   <!-- China -->
   <spnOverride numeric="46000" spn="中国移动" />
diff --git a/products/cyanogen_hallon.mk b/products/cyanogen_hallon.mk
index e769b84..27e805f 100644
--- a/products/cyanogen_hallon.mk
+++ b/products/cyanogen_hallon.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := hallon
 PRODUCT_MODEL := MT15i
 PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MT15i BUILD_ID=4.0.1.A.0.283 BUILD_FINGERPRINT=SEMC/MT15i_1247-0875/MT15i:2.3.4/4.0.1.A.0.283/bn_P:user/release-keys PRIVATE_BUILD_DESC="MT15i-user 2.3.4 4.0.1.A.0.283 bn_P test-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MT15i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/MT15i_1247-0875/MT15i:2.3.4/4.0.2.A.0.42/bn_P:user/release-keys PRIVATE_BUILD_DESC="MT15i-user 2.3.4 4.0.2.A.0.42 bn_P test-keys"
 
 # Build kernel
 #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
diff --git a/products/cyanogen_mango.mk b/products/cyanogen_mango.mk
index 77a1533..6fce3ea 100644
--- a/products/cyanogen_mango.mk
+++ b/products/cyanogen_mango.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := mango
 PRODUCT_MODEL := SK17i
 PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SK17i BUILD_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/SK17i_1249-8062/SK17i:2.3.3/4.0.A.2.368/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="SK17i-user 2.3.3 4.0.A.2.368 j_b_3w test-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SK17i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/SK17i_1249-8062/SK17i:2.3.4/4.0.2.A.0.42/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="SK17i-user 2.3.4 4.0.2.A.0.42 j_b_3w test-keys"
 
 # Build kernel
 #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=