Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into lboverview

Author: asudbring

.openpublishing.redirection.json

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: conceptual
-ms.date: 12/10/2019
+ms.date: 01/14/2020
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
@@ -30,15 +30,17 @@ More information about emergency access accounts and why they are important can
 
 ## Typical policies deployed by organizations
 
-* [Require MFA for administrators](howto-conditional-access-policy-admin-mfa.md)
-* [Require MFA for Azure management](howto-conditional-access-policy-azure-management.md)
-* [Require MFA for all users](howto-conditional-access-policy-all-users-mfa.md)
-* [Block legacy authentication](howto-conditional-access-policy-block-legacy.md)
+* [Require MFA for administrators](howto-conditional-access-policy-admin-mfa.md)\*
+* [Require MFA for Azure management](howto-conditional-access-policy-azure-management.md)\*
+* [Require MFA for all users](howto-conditional-access-policy-all-users-mfa.md)\*
+* [Block legacy authentication](howto-conditional-access-policy-block-legacy.md)\*
 * [Risk-based Conditional Access (Requires Azure AD Premium P2)](howto-conditional-access-policy-risk.md)
 * [Require trusted location for MFA registration](howto-conditional-access-policy-registration.md)
 * [Block access by location](howto-conditional-access-policy-location.md)
 * [Require compliant device](howto-conditional-access-policy-compliant-device.md)
 
+\* These four policies when configured together, would mimic functionality enabled by [security defaults](../fundamentals/concept-fundamentals-security-defaults.md).
+
 ## Next steps
 
 - [Simulate sign in behavior using the Conditional Access What If tool.](troubleshoot-conditional-access-what-if.md)

articles/active-directory/conditional-access/concept-conditional-access-policy-common.md

@@ -82,6 +82,8 @@
         href: tutorial-v2-windows-uwp.md
       - name: Windows Desktop .NET
         href: tutorial-v2-windows-desktop.md
+      - name: Use shared-device mode in your Android app
+        href: tutorial-v2-shared-device-mode.md
     - name: Daemon apps
       items:
       - name: ASP.NET daemon web app
@@ -208,6 +210,8 @@
           href: scenario-mobile-app-configuration.md
         - name: Mobile platforms specific config
           items:
+          - name: Shared device mode for Android devices
+            href: shared-device-mode.md
           - name: Xamarin Android
             href: msal-net-xamarin-android-considerations.md
           - name: System browser on Android