diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7821ac620..01a1d019f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
diff --git a/app/src/main/java/mozilla/lockbox/action/SettingAction.kt b/app/src/main/java/mozilla/lockbox/action/SettingAction.kt
index ebd98c53c..a63af471a 100644
--- a/app/src/main/java/mozilla/lockbox/action/SettingAction.kt
+++ b/app/src/main/java/mozilla/lockbox/action/SettingAction.kt
@@ -18,6 +18,7 @@ open class SettingAction(
     data class UnlockWithFingerprint(val unlockWithFingerprint: Boolean) : SettingAction(TelemetryEventMethod.setting_changed, TelemetryEventObject.settings_fingerprint, unlockWithFingerprint.toString())
     data class UnlockWithFingerprintPendingAuth(val unlockWithFingerprintPendingAuth: Boolean) : SettingAction(TelemetryEventMethod.setting_changed, TelemetryEventObject.settings_fingerprint_pending_auth, unlockWithFingerprintPendingAuth.toString())
     data class SendUsageData(val sendUsageData: Boolean) : SettingAction(TelemetryEventMethod.setting_changed, TelemetryEventObject.settings_record_usage_data, null)
+    data class UseLocalService(val useLocalService: Boolean) : SettingAction(TelemetryEventMethod.setting_changed, TelemetryEventObject.settings_use_local_service, null)
     data class ItemListSortOrder(val sortOrder: Setting.ItemListSort) : SettingAction(TelemetryEventMethod.setting_changed, TelemetryEventObject.settings_item_list_order, null)
     data class AutoLockTime(val time: Setting.AutoLockTime) : SettingAction(TelemetryEventMethod.setting_changed, TelemetryEventObject.settings_autolock_time, time.seconds.toString())
     data class Autofill(val enable: Boolean) : SettingAction(TelemetryEventMethod.setting_changed, TelemetryEventObject.settings_autofill, null)
diff --git a/app/src/main/java/mozilla/lockbox/action/TelemetryAction.kt b/app/src/main/java/mozilla/lockbox/action/TelemetryAction.kt
index 0a83b36b2..359d3256b 100644
--- a/app/src/main/java/mozilla/lockbox/action/TelemetryAction.kt
+++ b/app/src/main/java/mozilla/lockbox/action/TelemetryAction.kt
@@ -73,6 +73,7 @@ enum class TelemetryEventObject {
     settings_autolock,
     settings_reset,
     settings_record_usage_data,
+    settings_use_local_service,
     settings_account,
     settings_faq,
     settings_provide_feedback,
diff --git a/app/src/main/java/mozilla/lockbox/presenter/AppRoutePresenter.kt b/app/src/main/java/mozilla/lockbox/presenter/AppRoutePresenter.kt
index 8cca752ee..e1c3eaa7d 100644
--- a/app/src/main/java/mozilla/lockbox/presenter/AppRoutePresenter.kt
+++ b/app/src/main/java/mozilla/lockbox/presenter/AppRoutePresenter.kt
@@ -122,6 +122,7 @@ class AppRoutePresenter(
             R.id.fragment_welcome to R.id.fragment_fxa_login -> R.id.action_welcome_to_fxaLogin
             R.id.fragment_welcome to R.id.fragment_item_list -> R.id.action_welcome_to_autoLogin
             R.id.fragment_welcome to R.id.fragment_webview -> R.id.action_welcome_to_faq
+            R.id.fragment_welcome to R.id.fragment_setting -> R.id.action_welcome_to_settings
 
             R.id.fragment_fxa_login to R.id.fragment_item_list -> R.id.action_fxaLogin_to_itemList
             R.id.fragment_fxa_login to R.id.fragment_fingerprint_onboarding -> R.id.action_fxaLogin_to_fingerprint_onboarding
diff --git a/app/src/main/java/mozilla/lockbox/presenter/SettingPresenter.kt b/app/src/main/java/mozilla/lockbox/presenter/SettingPresenter.kt
index 4fb864367..8f3fa7b1e 100644
--- a/app/src/main/java/mozilla/lockbox/presenter/SettingPresenter.kt
+++ b/app/src/main/java/mozilla/lockbox/presenter/SettingPresenter.kt
@@ -12,6 +12,7 @@ import io.reactivex.Observable
 import io.reactivex.functions.Consumer
 import io.reactivex.rxkotlin.Observables
 import io.reactivex.rxkotlin.addTo
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import mozilla.lockbox.BuildConfig
 import mozilla.lockbox.R
 import mozilla.lockbox.action.AppWebPageAction
@@ -27,6 +28,7 @@ import mozilla.lockbox.adapter.TextSettingConfiguration
 import mozilla.lockbox.adapter.ToggleSettingConfiguration
 import mozilla.lockbox.flux.Dispatcher
 import mozilla.lockbox.flux.Presenter
+import mozilla.lockbox.store.AccountStore
 import mozilla.lockbox.store.FingerprintStore
 import mozilla.lockbox.store.SettingStore
 
@@ -37,9 +39,12 @@ interface SettingView {
     )
 }
 
+@ExperimentalCoroutinesApi
 class SettingPresenter(
     val view: SettingView,
+    val chinaBuild: Boolean,
     private val dispatcher: Dispatcher = Dispatcher.shared,
+    private val accountStore: AccountStore = AccountStore.shared,
     private val settingStore: SettingStore = SettingStore.shared,
     private val fingerprintStore: FingerprintStore = FingerprintStore.shared
 ) : Presenter() {
@@ -83,6 +88,11 @@ class SettingPresenter(
             dispatcher.dispatch(SettingAction.SendUsageData(newValue))
         }
 
+    private val useLocalServiceObserver: Consumer<Boolean>
+        get() = Consumer { newValue ->
+            dispatcher.dispatch((SettingAction.UseLocalService(newValue)))
+        }
+
     private val learnMoreSendUsageDataObserver: Consumer<Unit>
         get() = Consumer {
             dispatcher.dispatch(AppWebPageAction.Privacy)
@@ -163,11 +173,31 @@ class SettingPresenter(
             )
         )
 
+        val serviceSettings = listOf(
+            ToggleSettingConfiguration(
+                title = R.string.use_local_service,
+                contentDescription = R.string.use_local_service_description,
+                toggleDriver = settingStore.useLocalService,
+                toggleObserver = useLocalServiceObserver
+            )
+        )
         val sections = listOf(
             SectionedAdapter.Section(0, R.string.configuration_title),
             SectionedAdapter.Section(configurationSettings.size, R.string.support_title)
         )
+        val sectionsSync = listOf(
+            SectionedAdapter.Section(0, R.string.service_title),
+            SectionedAdapter.Section(serviceSettings.size, R.string.support_title)
+        )
 
-        view.updateSettingList(configurationSettings + supportSettings, sections)
+        if (chinaBuild) {
+            if (accountStore.checkAccountExisting()) {
+                view.updateSettingList(configurationSettings + supportSettings, sections)
+            } else {
+                view.updateSettingList(serviceSettings + supportSettings, sectionsSync)
+            }
+        } else {
+            view.updateSettingList(configurationSettings + supportSettings, sections)
+        }
     }
 }
diff --git a/app/src/main/java/mozilla/lockbox/presenter/WelcomePresenter.kt b/app/src/main/java/mozilla/lockbox/presenter/WelcomePresenter.kt
index cbf45a75e..6e8ae422e 100644
--- a/app/src/main/java/mozilla/lockbox/presenter/WelcomePresenter.kt
+++ b/app/src/main/java/mozilla/lockbox/presenter/WelcomePresenter.kt
@@ -24,6 +24,8 @@ interface WelcomeView {
     val getStartedAutomaticallyClicks: Observable<Unit>
     val getStartedManuallyClicks: Observable<Unit>
     val learnMoreClicks: Observable<Unit>
+    val switchServiceClicks: Observable<Unit>
+    fun hideSwitchService()
     fun showExistingAccount(email: String)
     fun hideExistingAccount()
 }
@@ -31,6 +33,7 @@ interface WelcomeView {
 @ExperimentalCoroutinesApi
 class WelcomePresenter(
     private val view: WelcomeView,
+    private val chinaBuild: Boolean,
     private val dispatcher: Dispatcher = Dispatcher.shared,
     private val accountStore: AccountStore = AccountStore.shared,
     private val fingerprintStore: FingerprintStore = FingerprintStore.shared
@@ -51,6 +54,10 @@ class WelcomePresenter(
             view.hideExistingAccount()
         }
 
+        if (!chinaBuild) {
+            view.hideSwitchService()
+        }
+
         view.getStartedManuallyClicks
             .map {
                 routeToLoginManually()
@@ -63,6 +70,13 @@ class WelcomePresenter(
                 dispatcher.dispatch(AppWebPageAction.FaqWelcome)
             }
             .addTo(compositeDisposable)
+
+        view.switchServiceClicks
+            .map {
+                RouteAction.SettingList
+            }
+            .subscribe(dispatcher::dispatch)
+            .addTo(compositeDisposable)
     }
 
     private fun routeToExistingAccount(account: ShareableAccount) =
diff --git a/app/src/main/java/mozilla/lockbox/store/AccountStore.kt b/app/src/main/java/mozilla/lockbox/store/AccountStore.kt
index 5cd966fda..10d2dc066 100644
--- a/app/src/main/java/mozilla/lockbox/store/AccountStore.kt
+++ b/app/src/main/java/mozilla/lockbox/store/AccountStore.kt
@@ -59,6 +59,7 @@ import kotlin.coroutines.CoroutineContext
 @ExperimentalCoroutinesApi
 open class AccountStore(
     private val lifecycleStore: LifecycleStore = LifecycleStore.shared,
+    private val settingStore: SettingStore = SettingStore.shared,
     private val dispatcher: Dispatcher = Dispatcher.shared,
     private val securePreferences: SecurePreferences = SecurePreferences.shared,
     private val timingSupport: SystemTimingSupport = DeviceSystemTimingSupport.shared
@@ -142,6 +143,9 @@ open class AccountStore(
         this.context = context
     }
 
+    fun checkAccountExisting(): Boolean {
+        return (storedAccountJSON != null)
+    }
     fun shareableAccount(): ShareableAccount? {
         return AccountSharing.queryShareableAccounts(context).firstOrNull()
     }
@@ -266,9 +270,17 @@ open class AccountStore(
 
     private fun generateNewFirefoxAccount() {
         try {
-            val config = ServerConfig.release(Constant.FxA.clientID, Constant.FxA.redirectUri)
-            fxa = FirefoxAccount(config)
-            generateLoginURL()
+            settingStore.useLocalService.subscribe {
+                    val config: ServerConfig
+                    if (it)
+                        config = ServerConfig("https://accounts.firefox.com.cn", Constant.FxA.clientID, Constant.FxA.redirectUri)
+                    else
+                        config = ServerConfig.release(Constant.FxA.clientID, Constant.FxA.redirectUri)
+
+                    fxa = FirefoxAccount(config)
+                    generateLoginURL()
+                }
+                .addTo(compositeDisposable)
         } catch (e: FxaException) {
             this.pushError(e)
         }
diff --git a/app/src/main/java/mozilla/lockbox/store/SettingStore.kt b/app/src/main/java/mozilla/lockbox/store/SettingStore.kt
index 7325653cd..c1ce71d13 100644
--- a/app/src/main/java/mozilla/lockbox/store/SettingStore.kt
+++ b/app/src/main/java/mozilla/lockbox/store/SettingStore.kt
@@ -42,6 +42,7 @@ open class SettingStore(
         const val AUTO_LOCK_TIME = "auto_lock_time"
         const val DEVICE_SECURITY_PRESENT = "device_security_present"
         const val UNLOCK_WITH_FINGERPRINT_PENDING_AUTH = "unlock_with_fingerprint_pending_auth"
+        const val USE_LOCAL_SERVICE = "use_local_service"
     }
 
     private lateinit var preferences: SharedPreferences
@@ -53,6 +54,7 @@ open class SettingStore(
     private val _autoLockTime = ReplaySubject.createWithSize<Setting.AutoLockTime>(1)
 
     open val sendUsageData: Observable<Boolean> = ReplaySubject.createWithSize(1)
+    open val useLocalService: Observable<Boolean> = ReplaySubject.createWithSize(1)
     open val itemListSortOrder: Observable<Setting.ItemListSort> = ReplaySubject.createWithSize(1)
     open val unlockWithFingerprint: Observable<Boolean> = ReplaySubject.createWithSize(1)
     open val autoLockTime: Observable<Setting.AutoLockTime>
@@ -86,6 +88,8 @@ open class SettingStore(
                 when (it) {
                     is SettingAction.SendUsageData ->
                         edit.putBoolean(Keys.SEND_USAGE_DATA, it.sendUsageData)
+                    is SettingAction.UseLocalService ->
+                        edit.putBoolean(Keys.USE_LOCAL_SERVICE, it.useLocalService)
                     is SettingAction.ItemListSortOrder ->
                         edit.putString(Keys.ITEM_LIST_SORT_ORDER, it.sortOrder.name)
                     is SettingAction.UnlockWithFingerprint ->
@@ -98,6 +102,7 @@ open class SettingStore(
                         handleAutofill(it.enable)
                     is SettingAction.Reset -> {
                         edit.putBoolean(Keys.SEND_USAGE_DATA, Constant.SettingDefault.sendUsageData)
+                        edit.putBoolean(Keys.USE_LOCAL_SERVICE, Constant.SettingDefault.useLocalServiceFalse)
                         edit.putString(Keys.ITEM_LIST_SORT_ORDER, Constant.SettingDefault.itemListSort.name)
                         edit.putBoolean(Keys.UNLOCK_WITH_FINGERPRINT, Constant.SettingDefault.unlockWithFingerprint)
                         edit.putString(Keys.AUTO_LOCK_TIME, Constant.SettingDefault.autoLockTime.name)
@@ -110,7 +115,15 @@ open class SettingStore(
     }
 
     override fun injectContext(context: Context) {
+        val chinaBuild = context.resources.configuration.locales.get(0).toString().equals("zh_CN_#Hans") &&
+            context.resources.configuration.locales.get(0).displayLanguage.equals("中文") &&
+            (!"com.android.vending".equals(context.packageManager.getInstallerPackageName(context.packageName)))
         preferences = PreferenceManager.getDefaultSharedPreferences(context)
+        if (chinaBuild) {
+            preferences.edit().putBoolean(Keys.USE_LOCAL_SERVICE, Constant.SettingDefault.useLocalServiceTrue).apply()
+        } else {
+            preferences.edit().putBoolean(Keys.USE_LOCAL_SERVICE, Constant.SettingDefault.useLocalServiceFalse).apply()
+        }
 
         val rxPrefs = RxSharedPreferences.create(preferences)
 
@@ -119,6 +132,18 @@ open class SettingStore(
             .asObservable()
             .subscribe(sendUsageData as Subject)
 
+        if (chinaBuild) {
+            rxPrefs
+                .getBoolean(Keys.USE_LOCAL_SERVICE, Constant.SettingDefault.useLocalServiceTrue)
+                .asObservable()
+                .subscribe(useLocalService as Subject)
+        } else {
+            rxPrefs
+                .getBoolean(Keys.USE_LOCAL_SERVICE, Constant.SettingDefault.useLocalServiceFalse)
+                .asObservable()
+                .subscribe(useLocalService as Subject)
+        }
+
         rxPrefs
             .getString(Keys.ITEM_LIST_SORT_ORDER, Constant.SettingDefault.itemListSort.name)
             .asObservable()
diff --git a/app/src/main/java/mozilla/lockbox/support/Constant.kt b/app/src/main/java/mozilla/lockbox/support/Constant.kt
index 594dd1b85..e3dd6a6a3 100644
--- a/app/src/main/java/mozilla/lockbox/support/Constant.kt
+++ b/app/src/main/java/mozilla/lockbox/support/Constant.kt
@@ -54,6 +54,8 @@ object Constant {
         val autoLockTime = Setting.AutoLockTime.FiveMinutes
         val noSecurityAutoLockTime = Setting.AutoLockTime.Never
         const val sendUsageData = true
+        const val useLocalServiceFalse = false
+        const val useLocalServiceTrue = true
         const val unlockWithFingerprint = false
     }
 
diff --git a/app/src/main/java/mozilla/lockbox/view/SettingFragment.kt b/app/src/main/java/mozilla/lockbox/view/SettingFragment.kt
index 5d3492ec2..0daaaf807 100644
--- a/app/src/main/java/mozilla/lockbox/view/SettingFragment.kt
+++ b/app/src/main/java/mozilla/lockbox/view/SettingFragment.kt
@@ -15,6 +15,7 @@ import android.view.ViewGroup
 import com.github.magiepooh.recycleritemdecoration.ItemDecorations
 import kotlinx.android.synthetic.main.fragment_setting.view.*
 import kotlinx.android.synthetic.main.list_cell_setting_toggle.view.*
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import mozilla.lockbox.R
 import mozilla.lockbox.adapter.SectionedAdapter
 import mozilla.lockbox.adapter.SettingCellConfiguration
@@ -24,6 +25,7 @@ import mozilla.lockbox.adapter.SettingListAdapter.Companion.SETTING_TOGGLE_TYPE
 import mozilla.lockbox.presenter.SettingPresenter
 import mozilla.lockbox.presenter.SettingView
 
+@ExperimentalCoroutinesApi
 class SettingFragment : BackableFragment(), SettingView {
 
     private val adapter = SettingListAdapter()
@@ -39,7 +41,10 @@ class SettingFragment : BackableFragment(), SettingView {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        presenter = SettingPresenter(this)
+        val chinaBuild = resources.configuration.locales.get(0).toString().equals("zh_CN_#Hans") &&
+            resources.configuration.locales.get(0).displayLanguage.equals("中文") &&
+            (!"com.android.vending".equals(context!!.packageManager.getInstallerPackageName(context!!.packageName)))
+        presenter = SettingPresenter(this, chinaBuild)
 
         // Inflate the layout for this fragment
         val view = inflater.inflate(R.layout.fragment_setting, container, false)
diff --git a/app/src/main/java/mozilla/lockbox/view/WelcomeFragment.kt b/app/src/main/java/mozilla/lockbox/view/WelcomeFragment.kt
index acc254fa7..3148f7081 100644
--- a/app/src/main/java/mozilla/lockbox/view/WelcomeFragment.kt
+++ b/app/src/main/java/mozilla/lockbox/view/WelcomeFragment.kt
@@ -25,7 +25,10 @@ class WelcomeFragment : Fragment(), WelcomeView {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        presenter = WelcomePresenter(this)
+        val chinaBuild = resources.configuration.locales.get(0).toString().equals("zh_CN_#Hans") &&
+            resources.configuration.locales.get(0).displayLanguage.equals("中文") &&
+            (!"com.android.vending".equals(context!!.packageManager.getInstallerPackageName(context!!.packageName)))
+        presenter = WelcomePresenter(this, chinaBuild)
         val view = inflater.inflate(R.layout.fragment_welcome, container, false)
         val appLabel = getString(R.string.app_label)
         view.textViewInstructions.text = getString(R.string.welcome_instructions, appLabel)
@@ -53,6 +56,12 @@ class WelcomeFragment : Fragment(), WelcomeView {
         }
     }
 
+    override fun hideSwitchService() {
+        view?.apply {
+            textViewSwitchService.visibility = View.GONE
+        }
+    }
+
     override val getStartedAutomaticallyClicks: Observable<Unit>
         get() = view!!.buttonGetStarted.clicks()
 
@@ -61,4 +70,7 @@ class WelcomeFragment : Fragment(), WelcomeView {
 
     override val learnMoreClicks: Observable<Unit>
         get() = view!!.textViewLearnMore.clicks()
+
+    override val switchServiceClicks: Observable<Unit>
+        get() = view!!.textViewSwitchService.clicks()
 }
diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
index 1aa84167b..e86b7a340 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -134,5 +134,21 @@
             android:letterSpacing="0.04"
             android:layout_gravity="center"
         />
+
+        <TextView
+                android:id="@+id/textViewSwitchService"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/welcome_switch_service_btn"
+                android:textStyle="bold"
+                android:textAllCaps="true"
+                android:background="@android:color/transparent"
+                android:textColor="@color/link_pressed"
+                android:textSize="12sp"
+                android:textAlignment="center"
+                android:letterSpacing="0.04"
+                android:layout_gravity="center"
+                />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/graph_main.xml b/app/src/main/res/navigation/graph_main.xml
index db65b3d1f..a6b394508 100644
--- a/app/src/main/res/navigation/graph_main.xml
+++ b/app/src/main/res/navigation/graph_main.xml
@@ -68,6 +68,9 @@
         <action
                 android:id="@+id/action_welcome_to_fxaLogin"
                 app:destination="@id/fragment_fxa_login"/>
+        <action
+                android:id="@+id/action_welcome_to_settings"
+                app:destination="@id/fragment_setting"/>
         <action
                 android:id="@+id/action_welcome_to_faq"
                 app:destination="@id/fragment_webview"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e17bdbb1..4d6f5ec59 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,6 +28,7 @@
     <!-- This is the link on the first-run welcome screen to learn more about the requirements of the application -->
     <string name="welcome_learn_more_btn">Learn More</string>
 
+    <string name="welcome_switch_service_btn" tools:ignore = "MissingTranslation">Switch Service</string>
     <!-- This is the label used for the title in the web view of the account's authentication instances. -->
     <string name="get_started_title">Get Started</string>
 
@@ -96,6 +97,7 @@
     <!-- This describes an icon to screenreaders that the button tapped will display the password in plain text for immediate reading or use -->
     <string name="display_password_content_description">Display your password in plain text</string>
 
+    <string name="service_title" tools:ignore= "MissingTranslation">Service</string>
     <!-- This is a heading that appears above a group of application settings to configure the user experience -->
     <string name="configuration_title">Configuration</string>
     <!-- This is a heading that appears above a group of application settings or links related to what is supported by the application -->
@@ -134,6 +136,8 @@
     <!-- This is the sub-title of a setting that allows the user to automatically fill forms in Android applications and websites using username and password data from this application -->
     <string name="send_usage_data_summary">Mozilla strives to only collect what we need to provide and improve Firefox for everyone. </string>
 
+    <string name="use_local_service" tools:ignore = "MissingTranslation">Use Local Service</string>
+    <string name="use_local_service_description" tools:ignore = "MissingTranslation">Switch Sync Service</string>
     <!-- This is the label a screenreader uses to inform the user they selected a label on the screen that includes the application version number -->
     <string name="app_version_description">Application version number</string>
 
diff --git a/app/src/test/java/mozilla/lockbox/presenter/SettingPresenterTest.kt b/app/src/test/java/mozilla/lockbox/presenter/SettingPresenterTest.kt
index 477b34617..ffa51c8fc 100644
--- a/app/src/test/java/mozilla/lockbox/presenter/SettingPresenterTest.kt
+++ b/app/src/test/java/mozilla/lockbox/presenter/SettingPresenterTest.kt
@@ -9,6 +9,7 @@ package mozilla.lockbox.presenter
 import io.reactivex.observers.TestObserver
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import mozilla.lockbox.R
 import mozilla.lockbox.action.AppWebPageAction
 import mozilla.lockbox.action.DialogAction
@@ -25,6 +26,7 @@ import mozilla.lockbox.adapter.ToggleSettingConfiguration
 import mozilla.lockbox.extensions.assertLastValue
 import mozilla.lockbox.flux.Action
 import mozilla.lockbox.flux.Dispatcher
+import mozilla.lockbox.store.AccountStore
 import mozilla.lockbox.store.FingerprintStore
 import mozilla.lockbox.store.SettingStore
 import org.junit.Assert
@@ -40,6 +42,7 @@ import org.robolectric.RobolectricTestRunner
 import org.mockito.Mockito.`when` as whenCalled
 
 @RunWith(RobolectricTestRunner::class)
+@ExperimentalCoroutinesApi
 class SettingPresenterTest {
     class SettingViewFake : SettingView {
         var settingItem: List<SettingCellConfiguration>? = null
@@ -56,6 +59,7 @@ class SettingPresenterTest {
 
     private val unlockWithFingerprintStub = PublishSubject.create<Boolean>()
     private val sendUsageDataStub = PublishSubject.create<Boolean>()
+    private val useLocalServiceStub = PublishSubject.create<Boolean>()
     private val itemListSortOrderStub = PublishSubject.create<Setting.ItemListSort>()
     private val unlockWithFingerprintPendingAuthStub = PublishSubject.create<Boolean>()
     private val autoLockTimeStub = PublishSubject.create<Setting.AutoLockTime>()
@@ -63,6 +67,7 @@ class SettingPresenterTest {
 
     @Mock
     val settingStore = PowerMockito.mock(SettingStore::class.java)
+    val accountStore = PowerMockito.mock(AccountStore::class.java)
 
     private lateinit var testHelper: ListAdapterTestHelper
     private val view = SettingViewFake()
@@ -78,6 +83,7 @@ class SettingPresenterTest {
         whenCalled(settingStore.unlockWithFingerprint).thenReturn(unlockWithFingerprintStub)
         whenCalled(settingStore.unlockWithFingerprintPendingAuth).thenReturn(unlockWithFingerprintPendingAuthStub)
         whenCalled(settingStore.sendUsageData).thenReturn(sendUsageDataStub)
+        whenCalled(settingStore.useLocalService).thenReturn(useLocalServiceStub)
         whenCalled(settingStore.itemListSortOrder).thenReturn(itemListSortOrderStub)
         whenCalled(settingStore.onEnablingFingerprint).thenReturn(onEnablingFingerprintStub)
 
@@ -87,7 +93,9 @@ class SettingPresenterTest {
         testHelper = ListAdapterTestHelper()
         subject = SettingPresenter(
             view,
+            false,
             dispatcher,
+            accountStore,
             settingStore,
             fingerprintStore
         )
diff --git a/app/src/test/java/mozilla/lockbox/presenter/WelcomePresenterTest.kt b/app/src/test/java/mozilla/lockbox/presenter/WelcomePresenterTest.kt
index a14e29864..9ad7b5039 100644
--- a/app/src/test/java/mozilla/lockbox/presenter/WelcomePresenterTest.kt
+++ b/app/src/test/java/mozilla/lockbox/presenter/WelcomePresenterTest.kt
@@ -25,6 +25,7 @@ import org.mockito.Mockito
 class WelcomePresenterTest {
     class FakeWelcomeView : WelcomeView {
         var existingAccount: Boolean? = null
+        var chinaBuild: Boolean? = null
 
         override fun showExistingAccount(email: String) {
             existingAccount = true
@@ -34,6 +35,10 @@ class WelcomePresenterTest {
             existingAccount = false
         }
 
+        override fun hideSwitchService() {
+            chinaBuild = false
+        }
+
         val learnMoreStub = PublishSubject.create<Unit>()
         override val learnMoreClicks: Observable<Unit> = learnMoreStub
 
@@ -44,6 +49,10 @@ class WelcomePresenterTest {
         val getStartedExistingAcccountStub: PublishSubject<Unit> = PublishSubject.create<Unit>()
         override val getStartedAutomaticallyClicks: Observable<Unit>
             get() = getStartedExistingAcccountStub
+
+        val switchServiceStub: PublishSubject<Unit> = PublishSubject.create<Unit>()
+        override val switchServiceClicks: Observable<Unit>
+            get() = switchServiceStub
     }
 
     @Mock
@@ -58,7 +67,7 @@ class WelcomePresenterTest {
     val dispatcher = Dispatcher()
     val dispatcherObserver = TestObserver.create<Action>()
 
-    val subject = WelcomePresenter(view, dispatcher,
+    val subject = WelcomePresenter(view, false, dispatcher,
         accountStore = accountStore,
         fingerprintStore = fingerprintStore
     )
diff --git a/app/src/test/java/mozilla/lockbox/store/SettingStoreTest.kt b/app/src/test/java/mozilla/lockbox/store/SettingStoreTest.kt
index 4f0f84cd4..9eba612c4 100644
--- a/app/src/test/java/mozilla/lockbox/store/SettingStoreTest.kt
+++ b/app/src/test/java/mozilla/lockbox/store/SettingStoreTest.kt
@@ -7,8 +7,11 @@
 package mozilla.lockbox.store
 
 import android.content.Context
+import android.content.res.Resources
 import android.content.SharedPreferences
+import android.content.res.Configuration
 import android.os.Build
+import android.os.LocaleList
 import android.preference.PreferenceManager
 import android.view.autofill.AutofillManager
 import com.f2prateek.rx.preferences2.Preference
@@ -41,6 +44,7 @@ import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 import org.robolectric.util.ReflectionHelpers
+import java.util.Locale
 import org.mockito.Mockito.`when` as whenCalled
 
 @RunWith(PowerMockRunner::class)
@@ -49,6 +53,18 @@ class SettingStoreTest : DisposingTest() {
     @Mock
     val context: Context = Mockito.mock(Context::class.java)
 
+    @Mock
+    val resources: Resources = Mockito.mock(Resources::class.java)
+
+    @Mock
+    val configuration: Configuration = Mockito.mock(Configuration::class.java)
+
+    @Mock
+    val locales: LocaleList = Mockito.mock(LocaleList::class.java)
+
+    @Mock
+    val locale: Locale = Mockito.mock(Locale::class.java)
+
     @Mock
     val sharedPreferences: SharedPreferences = Mockito.mock(SharedPreferences::class.java)
 
@@ -139,6 +155,21 @@ class SettingStoreTest : DisposingTest() {
         override fun delete() { TODO("not implemented") }
     }
 
+    private val useLocalServiceSetting = PublishSubject.create<Boolean>()
+    private val useLocalserviceStub = object : Preference<Boolean> {
+        override fun asObservable(): Observable<Boolean> {
+            return useLocalServiceSetting
+        }
+
+        override fun isSet(): Boolean { TODO("not implemented") }
+        override fun key(): String { TODO("not implemented") }
+        override fun asConsumer(): Consumer<in Boolean> { TODO("not implemented") }
+        override fun defaultValue(): Boolean { TODO("not implemented") }
+        override fun get(): Boolean { TODO("not implemented") }
+        override fun set(value: Boolean) { TODO("not implemented") }
+        override fun delete() { TODO("not implemented") }
+    }
+
     private val itemListSortSetting = PublishSubject.create<String>()
     private val itemListSortStub = object : Preference<String> {
         override fun asObservable(): Observable<String> {
@@ -157,6 +188,7 @@ class SettingStoreTest : DisposingTest() {
     private val dispatcher = Dispatcher()
     var subject = SettingStore(dispatcher, fingerprintStore)
     private val sendUsageDataObserver = TestObserver<Boolean>()
+    private val useLocalServiceObserver = TestObserver<Boolean>()
     private val itemListSortOrder = TestObserver<Setting.ItemListSort>()
     private val unlockWithFingerprint = TestObserver<Boolean>()
     private val autoLockTime = TestObserver<Setting.AutoLockTime>()
@@ -168,6 +200,11 @@ class SettingStoreTest : DisposingTest() {
     fun setUp() {
         ReflectionHelpers.setStaticField(Build.VERSION::class.java, "SDK_INT", 28)
 
+        whenCalled(context.resources).thenReturn(resources)
+        whenCalled(resources.configuration).thenReturn(configuration)
+        whenCalled(configuration.locales).thenReturn(locales)
+        whenCalled(locales.get(0)).thenReturn(locale)
+
         whenCalled(editor.putBoolean(Mockito.anyString(), Mockito.anyBoolean())).thenReturn(editor)
         whenCalled(editor.putString(Mockito.anyString(), Mockito.anyString())).thenReturn(editor)
         whenCalled(sharedPreferences.edit()).thenReturn(editor)
@@ -178,6 +215,7 @@ class SettingStoreTest : DisposingTest() {
         whenCalled(rxSharedPreferences.getString(eq(SettingStore.Keys.AUTO_LOCK_TIME), anyString())).thenReturn(autoLockStub)
         whenCalled(rxSharedPreferences.getBoolean(eq(SettingStore.Keys.DEVICE_SECURITY_PRESENT), anyBoolean())).thenReturn(deviceSecureStub)
         whenCalled(rxSharedPreferences.getBoolean(eq(SettingStore.Keys.SEND_USAGE_DATA), anyBoolean())).thenReturn(sendUsageDataStub)
+        whenCalled(rxSharedPreferences.getBoolean(eq(SettingStore.Keys.USE_LOCAL_SERVICE), anyBoolean())).thenReturn(useLocalserviceStub)
         whenCalled(rxSharedPreferences.getBoolean(eq(SettingStore.Keys.UNLOCK_WITH_FINGERPRINT), anyBoolean())).thenReturn(unlockWithFingerprintStub)
         whenCalled(rxSharedPreferences.getString(eq(SettingStore.Keys.ITEM_LIST_SORT_ORDER), anyString())).thenReturn(itemListSortStub)
         whenCalled(rxSharedPreferences.getBoolean(SettingStore.Keys.UNLOCK_WITH_FINGERPRINT_PENDING_AUTH)).thenReturn(unlockWithFingerprintPendingAuthStub)
@@ -193,6 +231,7 @@ class SettingStoreTest : DisposingTest() {
         subject.sendUsageData.subscribe(sendUsageDataObserver)
         subject.unlockWithFingerprint.subscribe(unlockWithFingerprint)
         subject.itemListSortOrder.subscribe(itemListSortOrder)
+        subject.useLocalService.subscribe(useLocalServiceObserver)
 
         clearInvocations(editor)
     }
@@ -384,6 +423,7 @@ class SettingStoreTest : DisposingTest() {
 
         verify(editor).putString(SettingStore.Keys.ITEM_LIST_SORT_ORDER, Constant.SettingDefault.itemListSort.name)
         verify(editor).putBoolean(SettingStore.Keys.SEND_USAGE_DATA, Constant.SettingDefault.sendUsageData)
+        verify(editor).putBoolean(SettingStore.Keys.USE_LOCAL_SERVICE, Constant.SettingDefault.useLocalServiceFalse)
         verify(editor).putString(SettingStore.Keys.AUTO_LOCK_TIME, Constant.SettingDefault.autoLockTime.name)
         verify(editor).apply()
         verify(autofillManager).disableAutofillServices()
@@ -396,6 +436,7 @@ class SettingStoreTest : DisposingTest() {
 
         verify(editor).putString(SettingStore.Keys.ITEM_LIST_SORT_ORDER, Constant.SettingDefault.itemListSort.name)
         verify(editor).putBoolean(SettingStore.Keys.SEND_USAGE_DATA, Constant.SettingDefault.sendUsageData)
+        verify(editor).putBoolean(SettingStore.Keys.USE_LOCAL_SERVICE, Constant.SettingDefault.useLocalServiceFalse)
         verify(editor).putString(SettingStore.Keys.AUTO_LOCK_TIME, Constant.SettingDefault.autoLockTime.name)
         verify(editor).apply()
         verify(autofillManager).disableAutofillServices()
@@ -408,6 +449,7 @@ class SettingStoreTest : DisposingTest() {
 
         verify(editor).putString(SettingStore.Keys.ITEM_LIST_SORT_ORDER, Constant.SettingDefault.itemListSort.name)
         verify(editor).putBoolean(SettingStore.Keys.SEND_USAGE_DATA, Constant.SettingDefault.sendUsageData)
+        verify(editor).putBoolean(SettingStore.Keys.USE_LOCAL_SERVICE, Constant.SettingDefault.useLocalServiceFalse)
         verify(editor).putString(SettingStore.Keys.AUTO_LOCK_TIME, Constant.SettingDefault.autoLockTime.name)
         verify(editor).apply()
         verify(autofillManager, never()).disableAutofillServices()
@@ -420,6 +462,7 @@ class SettingStoreTest : DisposingTest() {
 
         verify(editor).putString(SettingStore.Keys.ITEM_LIST_SORT_ORDER, Constant.SettingDefault.itemListSort.name)
         verify(editor).putBoolean(SettingStore.Keys.SEND_USAGE_DATA, Constant.SettingDefault.sendUsageData)
+        verify(editor).putBoolean(SettingStore.Keys.USE_LOCAL_SERVICE, Constant.SettingDefault.useLocalServiceFalse)
         verify(editor).putString(SettingStore.Keys.AUTO_LOCK_TIME, Constant.SettingDefault.autoLockTime.name)
         verify(editor).apply()
         verify(autofillManager, never()).disableAutofillServices()