diff --git a/res/values/config.xml b/res/values/config.xml
index f8a7acc9c61..e69d9ca03b7 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -44,6 +44,9 @@
     <!-- Whether to show Camera laser sensor switch in Developer Options -->
     <bool name="config_show_camera_laser_sensor">false</bool>
 
+    <!-- Whether to show logical camera default switch in Developer Options -->
+    <bool name="config_show_logical_camera_default">false</bool>
+
     <!-- Whether to show Connected MAC Randomization in Developer Options
          as not all devices can support dynamic MAC address change.  -->
     <bool name="config_wifi_support_connected_mac_randomization">false</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fda46b7ea5a..bfcda8dcb51 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9107,6 +9107,9 @@
     <!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->
     <string name="camera_laser_sensor_switch">Camera Laser Sensor</string>
 
+    <!-- Title for logical camera default switch [CHAR LIMIT=NONE] -->
+    <string name="logical_camera_default_switch">Logical Camera As Default</string>
+
     <!-- Title of the setting to disable the automatic update -->
     <string name="ota_disable_automatic_update">Automatic system updates</string>
 
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 3836b43930b..c7d49de42f3 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -192,6 +192,10 @@
             android:key="camera_laser_sensor_switch"
             android:title="@string/camera_laser_sensor_switch" />
 
+        <SwitchPreference
+            android:key="logical_camera_default_switch"
+            android:title="@string/logical_camera_default_switch" />
+
         <Preference
             android:key="feature_flags_dashboard"
             android:title="@string/feature_flags_dashboard_title"
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 5f5d1a83c7d..e90b53cca6d 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -397,6 +397,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));
         controllers.add(new ConnectivityMonitorPreferenceController(context));
         controllers.add(new CameraLaserSensorPreferenceController(context));
+        controllers.add(new LogicalCameraDefaultPreferenceController(context));
         controllers.add(new WifiDisplayCertificationPreferenceController(context));
         controllers.add(new WifiVerboseLoggingPreferenceController(context));
         controllers.add(new WifiConnectedMacRandomizationPreferenceController(context));
diff --git a/src/com/android/settings/development/LogicalCameraDefaultPreferenceController.java b/src/com/android/settings/development/LogicalCameraDefaultPreferenceController.java
new file mode 100644
index 00000000000..284170106a5
--- /dev/null
+++ b/src/com/android/settings/development/LogicalCameraDefaultPreferenceController.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class LogicalCameraDefaultPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String KEY_LOGICAL_CAMERA_DEFAULT_SWITCH = "logical_camera_default_switch";
+    @VisibleForTesting
+    static final String BUILD_TYPE = "ro.build.type";
+    @VisibleForTesting
+    static final String PROPERTY_LOGICAL_CAMERA_DEFAULT = "persist.camera.logical.default";
+    @VisibleForTesting
+    static final int ENABLED = 1;
+    @VisibleForTesting
+    static final int DISABLED = 0;
+    @VisibleForTesting
+    static final String USERDEBUG_BUILD = "userdebug";
+    @VisibleForTesting
+    static final String ENG_BUILD = "eng";
+    @VisibleForTesting
+    static final String USER_BUILD = "user";
+
+    public LogicalCameraDefaultPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mContext.getResources().getBoolean(R.bool.config_show_logical_camera_default);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_LOGICAL_CAMERA_DEFAULT_SWITCH;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        String value = Integer.toString(isEnabled ? ENABLED : DISABLED);
+        SystemProperties.set(PROPERTY_LOGICAL_CAMERA_DEFAULT, value);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean enabled = isLogicalCameraDefault();
+        ((SwitchPreference) mPreference).setChecked(enabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        SystemProperties.set(PROPERTY_LOGICAL_CAMERA_DEFAULT, Integer.toString(DISABLED));
+        ((SwitchPreference) mPreference).setChecked(false);
+    }
+
+    private boolean isLogicalCameraDefault() {
+        final String prop = SystemProperties.get(PROPERTY_LOGICAL_CAMERA_DEFAULT,
+                Integer.toString(DISABLED));
+        return TextUtils.equals(Integer.toString(ENABLED), prop);
+    }
+
+}
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index cecc9c59c59..67628b06f71 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -62,6 +62,7 @@
     <bool name="config_show_wifi_ip_address">false</bool>
     <bool name="config_show_wifi_mac_address">false</bool>
     <bool name="config_disable_uninstall_update">true</bool>
+    <bool name="config_show_logical_camera_default">false</bool>
 
     <!-- List of a11y components on the device allowed to be enabled by Settings Slices -->
     <string-array name="config_settings_slices_accessibility_components" translatable="false">
diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml
index 359df6cc0a5..8ea12219315 100644
--- a/tests/robotests/res/values/config.xml
+++ b/tests/robotests/res/values/config.xml
@@ -22,4 +22,5 @@
     <bool name="config_show_connectivity_monitor">true</bool>
     <bool name="config_display_recent_apps">true</bool>
     <bool name="config_wifi_support_connected_mac_randomization">true</bool>
-</resources>
\ No newline at end of file
+    <bool name="config_show_logical_camera_default">true</bool>
+</resources>
diff --git a/tests/robotests/src/com/android/settings/development/LogicalCameraDefaultPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogicalCameraDefaultPreferenceControllerTest.java
new file mode 100644
index 00000000000..dab394459ab
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/LogicalCameraDefaultPreferenceControllerTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.LogicalCameraDefaultPreferenceController.ENG_BUILD;
+import static com.android.settings.development.LogicalCameraDefaultPreferenceController.USERDEBUG_BUILD;
+import static com.android.settings.development.LogicalCameraDefaultPreferenceController.USER_BUILD;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.os.SystemProperties;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class LogicalCameraDefaultPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private LogicalCameraDefaultPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new LogicalCameraDefaultPreferenceController(RuntimeEnvironment.application);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_withConfigNoShow_shouldReturnFalse() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_withUserdebugBuild_shouldReturnTrue() {
+        SystemProperties.set(LogicalCameraDefaultPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_withEngBuild_shouldReturnTrue() {
+        SystemProperties.set(LogicalCameraDefaultPreferenceController.BUILD_TYPE, ENG_BUILD);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_withUserBuild_shouldReturnTrue() {
+        SystemProperties.set(LogicalCameraDefaultPreferenceController.BUILD_TYPE, USER_BUILD);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_logicalCameraDefaultEnabled_shouldCheckedPreference() {
+        SystemProperties.set(LogicalCameraDefaultPreferenceController.PROPERTY_LOGICAL_CAMERA_DEFAULT,
+                Integer.toString(LogicalCameraDefaultPreferenceController.ENABLED));
+        SystemProperties.set(LogicalCameraDefaultPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        mController.updateState(mScreen);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_logicalCameraDefaultEnabled_shouldUncheckedPreference() {
+        SystemProperties.set(LogicalCameraDefaultPreferenceController.PROPERTY_LOGICAL_CAMERA_DEFAULT,
+                Integer.toString(LogicalCameraDefaultPreferenceController.DISABLED));
+        SystemProperties.set(
+                LogicalCameraDefaultPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+
+        mController.updateState(mScreen);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_shouldEnableLogicalCameraDefault() {
+        mController.onPreferenceChange(mPreference, true);
+
+        assertThat(Integer.toString(LogicalCameraDefaultPreferenceController.ENABLED)).isEqualTo(
+                SystemProperties.get(
+                        LogicalCameraDefaultPreferenceController.PROPERTY_LOGICAL_CAMERA_DEFAULT,
+                        Integer.toString(LogicalCameraDefaultPreferenceController.ENABLED)));
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceUnchecked_shouldDisableLogicalCameraDefault() {
+        mController.onPreferenceChange(mPreference, false);
+
+        assertThat(Integer.toString(LogicalCameraDefaultPreferenceController.DISABLED)).isEqualTo(
+                SystemProperties.get(
+                        LogicalCameraDefaultPreferenceController.PROPERTY_LOGICAL_CAMERA_DEFAULT,
+                        Integer.toString(LogicalCameraDefaultPreferenceController.ENABLED)));
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+        assertThat(Integer.toString(LogicalCameraDefaultPreferenceController.DISABLED)).isEqualTo(
+                SystemProperties.get(
+                        LogicalCameraDefaultPreferenceController.PROPERTY_LOGICAL_CAMERA_DEFAULT,
+                        Integer.toString(LogicalCameraDefaultPreferenceController.ENABLED)));
+    }
+}