diff --git a/.github/scripts/gradlew_recursive.sh b/.github/scripts/gradlew_recursive.sh
new file mode 100755
index 00000000..ca5d6b0e
--- /dev/null
+++ b/.github/scripts/gradlew_recursive.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -xe
+
+# Crawl all gradlew files which indicate an Android project
+# You may edit this if your repo has a different project structure
+for GRADLEW in `find . -name "gradlew"` ; do
+    SAMPLE=$(dirname "${GRADLEW}")
+    # Tell Gradle that this is a CI environment and disable parallel compilation
+    bash "$GRADLEW" -p "$SAMPLE" -Pci --no-parallel --stacktrace $@
+done
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
new file mode 100644
index 00000000..da328ab8
--- /dev/null
+++ b/.github/workflows/android.yml
@@ -0,0 +1,73 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  test:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 9
+        uses: actions/setup-java@v1
+        with:
+          java-version: 9
+      - name: Run unit tests
+        run: .github/scripts/gradlew_recursive.sh test
+      - name: Zip reports
+        if: always()
+        run: zip -r reports.zip . -i '**/reports/*.xml' '**/reports/*.html'
+      - name: Upload reports
+        if: always()
+        uses: actions/upload-artifact@v1
+        with:
+          name: unit_test_reports
+          path: reports.zip
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Run linter
+        run: .github/scripts/gradlew_recursive.sh lint
+      - name: Zip reports
+        if: always()
+        run: zip -r reports.zip . -i '**/reports/*.xml' '**/reports/*.html'
+      - name: Upload reports
+        if: always()
+        uses: actions/upload-artifact@v1
+        with:
+          name: lint_reports
+          path: reports.zip
+
+  build:
+    name: Build
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build project
+        run: .github/scripts/gradlew_recursive.sh assembleDebug
+      - name: Zip artifacts
+        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: assemble
+          path: assemble.zip
diff --git a/Camera2Basic/app/build.gradle b/Camera2Basic/app/build.gradle
index 23c6abd0..78d40e86 100644
--- a/Camera2Basic/app/build.gradle
+++ b/Camera2Basic/app/build.gradle
@@ -47,17 +47,6 @@ android {
         }
     }
 
-    // Set the source of tests to same for both Unit and Instrumented tests
-    sourceSets {
-        String sharedTestDir = 'src/test/java'
-        test {
-            java.srcDir sharedTestDir
-        }
-        androidTest {
-            java.srcDir sharedTestDir
-        }
-    }
-
     // Necessary for Robolectric (Unit tests)
     testOptions.unitTests.includeAndroidResources = true
 }
@@ -66,17 +55,17 @@ dependencies {
     implementation project(':common')
 
     // Kotlin lang
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
 
     // App compat and UI things
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-rc03'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
     implementation "androidx.viewpager2:viewpager2:1.0.0"
 
     // Navigation library
-    def nav_version = "2.1.0"
+    def nav_version = '2.2.1'
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
@@ -92,7 +81,7 @@ dependencies {
     testImplementation 'androidx.test:rules:1.2.0'
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    testImplementation "org.robolectric:robolectric:4.3.1"
+    testImplementation 'org.robolectric:robolectric:4.3.1'
 
     // Instrumented testing
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
diff --git a/Camera2Basic/app/src/main/java/com/example/android/camera2/basic/fragments/CameraFragment.kt b/Camera2Basic/app/src/main/java/com/example/android/camera2/basic/fragments/CameraFragment.kt
index de4ede84..8274db4e 100644
--- a/Camera2Basic/app/src/main/java/com/example/android/camera2/basic/fragments/CameraFragment.kt
+++ b/Camera2Basic/app/src/main/java/com/example/android/camera2/basic/fragments/CameraFragment.kt
@@ -154,7 +154,7 @@ class CameraFragment : Fragment() {
 
         // Used to rotate the output media to match device orientation
         relativeOrientation = OrientationLiveData(requireContext(), characteristics).apply {
-            observe(this@CameraFragment, Observer {
+            observe(viewLifecycleOwner, Observer {
                 orientation -> Log.d(TAG, "Orientation changed: $orientation")
             })
         }
diff --git a/Camera2Basic/app/src/test/java/com/example/android/camera2/basic/InstrumentedTests.kt b/Camera2Basic/app/src/test/java/com/example/android/camera2/basic/InstrumentedTests.kt
index cb8222bb..0427fe7d 100644
--- a/Camera2Basic/app/src/test/java/com/example/android/camera2/basic/InstrumentedTests.kt
+++ b/Camera2Basic/app/src/test/java/com/example/android/camera2/basic/InstrumentedTests.kt
@@ -18,6 +18,7 @@ package com.example.android.camera2.basic
 
 import android.Manifest
 import android.content.Context
+import android.os.Build
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
@@ -27,6 +28,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
+
 @RunWith(AndroidJUnit4::class)
 class MainInstrumentedTest {
 
diff --git a/Camera2Basic/build.gradle b/Camera2Basic/build.gradle
index 6a9b9bcf..e448747b 100644
--- a/Camera2Basic/build.gradle
+++ b/Camera2Basic/build.gradle
@@ -26,9 +26,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.1"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/Camera2Basic/gradle/wrapper/gradle-wrapper.properties b/Camera2Basic/gradle/wrapper/gradle-wrapper.properties
index a7133bf8..2dce2567 100644
--- a/Camera2Basic/gradle/wrapper/gradle-wrapper.properties
+++ b/Camera2Basic/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 27 14:00:11 AEST 2019
+#Thu Mar 05 15:31:27 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/Camera2SlowMotion/app/build.gradle b/Camera2SlowMotion/app/build.gradle
index 11d6ff93..3f59fe4d 100644
--- a/Camera2SlowMotion/app/build.gradle
+++ b/Camera2SlowMotion/app/build.gradle
@@ -66,16 +66,16 @@ dependencies {
     implementation project(':common')
 
     // Kotlin lang
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
 
     // App compat and UI things
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-rc03'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
 
     // Navigation library
-    def nav_version = "2.1.0"
+    def nav_version = "2.2.1"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
diff --git a/Camera2SlowMotion/app/src/main/AndroidManifest.xml b/Camera2SlowMotion/app/src/main/AndroidManifest.xml
index 3ed99bd8..e9d2c7a9 100644
--- a/Camera2SlowMotion/app/src/main/AndroidManifest.xml
+++ b/Camera2SlowMotion/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
         android:allowBackup="true"
         android:label="@string/app_name"
         android:icon="@drawable/ic_launcher"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
 
         <activity
             android:name="com.example.android.camera2.slowmo.CameraActivity"
diff --git a/Camera2SlowMotion/app/src/main/java/com/example/android/camera2/slowmo/fragments/CameraFragment.kt b/Camera2SlowMotion/app/src/main/java/com/example/android/camera2/slowmo/fragments/CameraFragment.kt
index 03c35d92..941cd5a5 100644
--- a/Camera2SlowMotion/app/src/main/java/com/example/android/camera2/slowmo/fragments/CameraFragment.kt
+++ b/Camera2SlowMotion/app/src/main/java/com/example/android/camera2/slowmo/fragments/CameraFragment.kt
@@ -220,7 +220,7 @@ class CameraFragment : Fragment() {
 
         // Used to rotate the output media to match device orientation
         relativeOrientation = OrientationLiveData(requireContext(), characteristics).apply {
-            observe(this@CameraFragment, Observer {
+            observe(viewLifecycleOwner, Observer {
                 orientation -> Log.d(TAG, "Orientation changed: $orientation")
             })
         }
diff --git a/Camera2SlowMotion/app/src/main/res/drawable/ic_photo.xml b/Camera2SlowMotion/app/src/main/res/drawable/ic_photo.xml
deleted file mode 100644
index 6676ccb8..00000000
--- a/Camera2SlowMotion/app/src/main/res/drawable/ic_photo.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2019 Google LLC
-  ~
-  ~ 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
-  ~
-  ~     https://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.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#000000"
-        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
-</vector>
\ No newline at end of file
diff --git a/Camera2SlowMotion/app/src/main/res/layout/activity_camera.xml b/Camera2SlowMotion/app/src/main/res/layout/activity_camera.xml
index 33e8a04a..04d9e6fd 100644
--- a/Camera2SlowMotion/app/src/main/res/layout/activity_camera.xml
+++ b/Camera2SlowMotion/app/src/main/res/layout/activity_camera.xml
@@ -14,20 +14,15 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<FrameLayout
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/fragment_container"
+    android:name="androidx.navigation.fragment.NavHostFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true"
-    tools:context=".CameraActivity">
-
-    <fragment
-        android:id="@+id/fragment_container"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:navGraph="@navigation/nav_graph" />
-</FrameLayout>
\ No newline at end of file
+    app:defaultNavHost="true"
+    app:navGraph="@navigation/nav_graph"
+    tools:context=".CameraActivity" />
diff --git a/Camera2SlowMotion/build.gradle b/Camera2SlowMotion/build.gradle
index 2b3fae21..e448747b 100644
--- a/Camera2SlowMotion/build.gradle
+++ b/Camera2SlowMotion/build.gradle
@@ -26,9 +26,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.1"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/Camera2SlowMotion/gradle/wrapper/gradle-wrapper.properties b/Camera2SlowMotion/gradle/wrapper/gradle-wrapper.properties
index a7133bf8..9a3e0431 100644
--- a/Camera2SlowMotion/gradle/wrapper/gradle-wrapper.properties
+++ b/Camera2SlowMotion/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 27 14:00:11 AEST 2019
+#Thu Mar 05 16:15:48 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/Camera2VideoJava/Application/build.gradle b/Camera2VideoJava/Application/build.gradle
index 5a99955e..7dc4e1f7 100644
--- a/Camera2VideoJava/Application/build.gradle
+++ b/Camera2VideoJava/Application/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
diff --git a/Camera2VideoJava/gradle/wrapper/gradle-wrapper.properties b/Camera2VideoJava/gradle/wrapper/gradle-wrapper.properties
index ae45383b..09b47bd1 100644
--- a/Camera2VideoJava/gradle/wrapper/gradle-wrapper.properties
+++ b/Camera2VideoJava/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Mar 06 10:33:53 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/Camera2VideoKotlin/build.gradle b/Camera2VideoKotlin/build.gradle
index 03239d77..3a80490f 100644
--- a/Camera2VideoKotlin/build.gradle
+++ b/Camera2VideoKotlin/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/Camera2VideoKotlin/gradle/wrapper/gradle-wrapper.properties b/Camera2VideoKotlin/gradle/wrapper/gradle-wrapper.properties
index f9415508..4e5e0605 100644
--- a/Camera2VideoKotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/Camera2VideoKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Mar 06 10:32:20 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/CameraXBasic/app/build.gradle b/CameraXBasic/app/build.gradle
index f156349c..c831fbf4 100644
--- a/CameraXBasic/app/build.gradle
+++ b/CameraXBasic/app/build.gradle
@@ -47,17 +47,6 @@ android {
        }
     }
 
-    // Set the source of tests to same for both Unit and Instrumented tests
-    sourceSets {
-        String sharedTestDir = 'src/test/java'
-        test {
-            java.srcDir sharedTestDir
-        }
-        androidTest {
-            java.srcDir sharedTestDir
-        }
-    }
-
     // Necessary for Robolectric (Unit tests)
     testOptions {
         unitTests {
@@ -100,14 +89,14 @@ dependencies {
 
     // Glide
     implementation 'com.github.bumptech.glide:glide:4.11.0'
-    kapt 'com.github.bumptech.glide:compiler:4.10.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
 
     // Unit testing
     testImplementation 'androidx.test.ext:junit:1.1.1'
     testImplementation 'androidx.test:rules:1.2.0'
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    testImplementation "org.robolectric:robolectric:4.3.1"
+    testImplementation 'org.robolectric:robolectric:4.3.1'
 
     // Instrumented testing
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
diff --git a/CameraXBasic/app/src/main/AndroidManifest.xml b/CameraXBasic/app/src/main/AndroidManifest.xml
index 314df3fe..1fd25e6a 100644
--- a/CameraXBasic/app/src/main/AndroidManifest.xml
+++ b/CameraXBasic/app/src/main/AndroidManifest.xml
@@ -32,9 +32,9 @@
     <application
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:name=".CameraXBasic"
         android:label="@string/app_name"
-        android:allowBackup="true">
+        android:allowBackup="true"
+        tools:ignore="AllowBackup">
 
         <activity
             android:name=".MainActivity"
diff --git a/CameraXBasic/app/src/main/java/com/android/example/cameraxbasic/CameraXBasic.kt b/CameraXBasic/app/src/main/java/com/android/example/cameraxbasic/CameraXBasic.kt
deleted file mode 100644
index 5c991b4c..00000000
--- a/CameraXBasic/app/src/main/java/com/android/example/cameraxbasic/CameraXBasic.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2019 Google LLC
- *
- * 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
- *
- *     https://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.example.cameraxbasic
-
-import android.app.Application
-import androidx.camera.camera2.Camera2Config
-import androidx.camera.core.CameraXConfig
-
-/** It implements CameraXConfig.Provider */
-class CameraXBasic: Application(), CameraXConfig.Provider {
-
-    /** @returns Camera2 default configuration */
-    override fun getCameraXConfig(): CameraXConfig {
-        return Camera2Config.defaultConfig()
-    }
-}
diff --git a/CameraXBasic/app/src/main/res/drawable/ic_switch.xml b/CameraXBasic/app/src/main/res/drawable/ic_switch.xml
index ff42368c..ead56087 100644
--- a/CameraXBasic/app/src/main/res/drawable/ic_switch.xml
+++ b/CameraXBasic/app/src/main/res/drawable/ic_switch.xml
@@ -15,11 +15,13 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:tint="@color/selector_ic"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="46.0"
-    android:viewportHeight="46.0">
+    android:viewportHeight="46.0"
+    tools:ignore="VectorRaster">
     <path android:fillAlpha="0" android:fillColor="#D8D8D8"
         android:fillType="evenOdd" android:pathData="M-4,-4h54v54h-54z"
         android:strokeColor="#00000000" android:strokeWidth="1"/>
diff --git a/CameraXBasic/app/src/main/res/layout/activity_main.xml b/CameraXBasic/app/src/main/res/layout/activity_main.xml
index 6d198695..f8728388 100644
--- a/CameraXBasic/app/src/main/res/layout/activity_main.xml
+++ b/CameraXBasic/app/src/main/res/layout/activity_main.xml
@@ -14,21 +14,15 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<FrameLayout
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/fragment_container"
+    android:name="androidx.navigation.fragment.NavHostFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true"
-    tools:context=".MainActivity">
-
-    <fragment
-        android:id="@+id/fragment_container"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:navGraph="@navigation/nav_graph" />
-
-</FrameLayout>
\ No newline at end of file
+    app:defaultNavHost="true"
+    app:navGraph="@navigation/nav_graph"
+    tools:context=".MainActivity"/>
diff --git a/CameraXBasic/app/src/main/res/values-v28/styles.xml b/CameraXBasic/app/src/main/res/values-v28/styles.xml
index b8e78755..9fb7e0e8 100644
--- a/CameraXBasic/app/src/main/res/values-v28/styles.xml
+++ b/CameraXBasic/app/src/main/res/values-v28/styles.xml
@@ -18,13 +18,6 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:immersive">true</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 
diff --git a/CameraXBasic/app/src/main/res/values/styles.xml b/CameraXBasic/app/src/main/res/values/styles.xml
index d66bf4f5..b5a51a84 100644
--- a/CameraXBasic/app/src/main/res/values/styles.xml
+++ b/CameraXBasic/app/src/main/res/values/styles.xml
@@ -18,9 +18,6 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:immersive">true</item>
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowTranslucentStatus">true</item>
diff --git a/CameraXBasic/build.gradle b/CameraXBasic/build.gradle
index c2d862e3..e448747b 100644
--- a/CameraXBasic/build.gradle
+++ b/CameraXBasic/build.gradle
@@ -26,7 +26,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.1"
 
diff --git a/Common/build.gradle b/Common/build.gradle
index bc3f221f..c5d52e20 100644
--- a/Common/build.gradle
+++ b/Common/build.gradle
@@ -46,17 +46,6 @@ android {
         }
     }
 
-    // Set the source of tests to same for both Unit and Instrumented tests
-    sourceSets {
-        String sharedTestDir = 'src/test/java'
-        test {
-            java.srcDir sharedTestDir
-        }
-        androidTest {
-            java.srcDir sharedTestDir
-        }
-    }
-
     // Necessary for Robolectric (Unit tests)
     testOptions.unitTests.includeAndroidResources = true
 }
@@ -79,7 +68,7 @@ dependencies {
     testImplementation 'androidx.test:rules:1.2.0'
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    testImplementation "org.robolectric:robolectric:4.3.1"
+    testImplementation 'org.robolectric:robolectric:4.3.1'
 
     // Instrumented testing
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
diff --git a/Common/src/test/java/com/example/android/camera2/common/ExampleInstrumentedTest.kt b/Common/src/test/java/com/example/android/camera2/common/ExampleInstrumentedTest.kt
deleted file mode 100644
index a8d6d27b..00000000
--- a/Common/src/test/java/com/example/android/camera2/common/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2019 Google LLC
- *
- * 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
- *
- *     https://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.example.android.camera2.common
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.example.android.camera.common.test", appContext.packageName)
-    }
-}
diff --git a/HdrViewfinder/Application/build.gradle b/HdrViewfinder/Application/build.gradle
index 2fae2cc7..4f372e22 100644
--- a/HdrViewfinder/Application/build.gradle
+++ b/HdrViewfinder/Application/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
diff --git a/HdrViewfinder/Application/src/main/java/com/example/android/hdrviewfinder/HdrViewfinderActivity.java b/HdrViewfinder/Application/src/main/java/com/example/android/hdrviewfinder/HdrViewfinderActivity.java
index b421029e..bce6767e 100644
--- a/HdrViewfinder/Application/src/main/java/com/example/android/hdrviewfinder/HdrViewfinderActivity.java
+++ b/HdrViewfinder/Application/src/main/java/com/example/android/hdrviewfinder/HdrViewfinderActivity.java
@@ -648,7 +648,7 @@ public void showErrorDialog(String errorMessage) {
                 .show(getSupportFragmentManager(), FRAGMENT_DIALOG);
     }
 
-    @SuppressLint("SwitchIntDef")
+    @SuppressLint({"SwitchIntDef", "StringFormatMatches"})
     @Override
     public String getErrorString(CameraAccessException e) {
         String errorMessage;
diff --git a/HdrViewfinder/gradle/wrapper/gradle-wrapper.properties b/HdrViewfinder/gradle/wrapper/gradle-wrapper.properties
index ae45383b..5280767c 100644
--- a/HdrViewfinder/gradle/wrapper/gradle-wrapper.properties
+++ b/HdrViewfinder/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Mar 06 10:29:22 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip