diff --git a/app/build.gradle b/app/build.gradle
index 721ada01c..f2edce26a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,6 +48,11 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    lintOptions {
+        disable 'GoogleAppIndexingWarning'
+        disable 'IconLauncherShape'
+        warningsAsErrors true
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 20456f59e..1699d4635 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/app/src/main/java/com/google/samples/apps/sunflower/PlantDetailFragment.kt b/app/src/main/java/com/google/samples/apps/sunflower/PlantDetailFragment.kt
index f4f41dca4..184e8b6d7 100644
--- a/app/src/main/java/com/google/samples/apps/sunflower/PlantDetailFragment.kt
+++ b/app/src/main/java/com/google/samples/apps/sunflower/PlantDetailFragment.kt
@@ -123,7 +123,7 @@ class PlantDetailFragment : Fragment() {
                 getString(R.string.share_text_plant, plant.name)
             }
         }
-        val shareIntent = ShareCompat.IntentBuilder.from(activity)
+        ShareCompat.IntentBuilder.from(requireActivity())
             .setText(shareText)
             .setType("text/plain")
             .createChooserIntent()
@@ -136,8 +136,7 @@ class PlantDetailFragment : Fragment() {
                     // Else, we will use the old CLEAR_WHEN_TASK_RESET flag
                     addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET)
                 }
-            }
-        startActivity(shareIntent)
+            }.also { startActivity(it) }
     }
 
     // FloatingActionButtons anchored to AppBarLayouts have their visibility controlled by the scroll position.
diff --git a/app/src/main/java/com/google/samples/apps/sunflower/views/MaskedCardView.kt b/app/src/main/java/com/google/samples/apps/sunflower/views/MaskedCardView.kt
index e19d11186..41262b575 100644
--- a/app/src/main/java/com/google/samples/apps/sunflower/views/MaskedCardView.kt
+++ b/app/src/main/java/com/google/samples/apps/sunflower/views/MaskedCardView.kt
@@ -21,11 +21,11 @@ import android.graphics.Canvas
 import android.util.AttributeSet
 import com.google.android.material.R
 import com.google.android.material.card.MaterialCardView
-import com.google.android.material.shape.ShapeAppearanceModel
 import com.google.android.material.shape.ShapeAppearancePathProvider
 import android.annotation.SuppressLint
 import android.graphics.Path
 import android.graphics.RectF
+import com.google.android.material.shape.ShapeAppearanceModel
 
 /**
  * A Card view that clips the content of any shape, this should be done upstream in card,
@@ -39,8 +39,9 @@ class MaskedCardView @JvmOverloads constructor(
     @SuppressLint("RestrictedApi")
     private val pathProvider = ShapeAppearancePathProvider()
     private val path: Path = Path()
-    private val shapeAppearance: ShapeAppearanceModel =
-            ShapeAppearanceModel(context, attrs, defStyle, R.style.Widget_MaterialComponents_CardView)
+    private val shapeAppearance: ShapeAppearanceModel = ShapeAppearanceModel
+            .builder(context, attrs, defStyle, R.style.Widget_MaterialComponents_CardView)
+            .build()
     private val rectF = RectF(0f, 0f, 0f, 0f)
 
     override fun onDraw(canvas: Canvas) {
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 05983e01f..000000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 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:viewportHeight="108.0"
-    android:viewportWidth="108.0">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#66FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>
-
diff --git a/app/src/main/res/layout/fragment_plant_detail.xml b/app/src/main/res/layout/fragment_plant_detail.xml
index f7a315bdf..bf940e539 100644
--- a/app/src/main/res/layout/fragment_plant_detail.xml
+++ b/app/src/main/res/layout/fragment_plant_detail.xml
@@ -44,7 +44,8 @@
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             android:stateListAnimator="@animator/show_toolbar"
             android:background="?attr/colorSurface"
-            android:animateLayoutChanges="true">
+            android:animateLayoutChanges="true"
+            tools:targetApi="lollipop">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/toolbar_layout"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1abbd0c0c..68083294c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -19,7 +19,6 @@
     <string name="plant_detail_image_content_description">Bild der Pflanze</string>
     <string name="my_garden_title">Mein Garten</string>
     <string name="plant_list_title">Pflanzenliste</string>
-    <string name="available">Verfügbare Pflanzen</string>
     <string name="plant_details_title">Details zur Pflanze</string>
     <string name="add_plant">Pflanze hinzufügen</string>
     <string name="added_plant_to_garden">Pflanze wurde zum Garten hinzugefügt</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 069e4db99..30c9e5d6c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -19,7 +19,6 @@
     <string name="my_garden_title">Mon jardin</string>
     <string name="plant_detail_image_content_description">Image de plante</string>
     <string name="plant_list_title">Liste des plantes</string>
-    <string name="available">(translate me) Available Plants</string>
     <string name="plant_details_title">Détails sur la plante</string>
     <string name="add_plant">(translate me) Add plant</string>
     <string name="added_plant_to_garden">Plante ajoutée à votre jardin</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 80afaa82e..f1af9045f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -19,7 +19,6 @@
     <string name="plant_detail_image_content_description">Immagine della pianta</string>
     <string name="my_garden_title">Il mio giardino</string>
     <string name="plant_list_title">Lista delle piante</string>
-    <string name="available">(translate me) Available Plants</string>
     <string name="plant_details_title">Dettagli della pianta</string>
     <string name="menu_item_share_plant">Condividi</string>
     <string name="plant_date_header">(translate me) Planted</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6ec693e7f..d9f23767e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -19,7 +19,6 @@
     <string name="plant_detail_image_content_description">植物のイメージ</string>
     <string name="my_garden_title">私の庭</string>
     <string name="plant_list_title">植物のリスト</string>
-    <string name="available">(translate me) Available Plants</string>
     <string name="plant_details_title">植物の詳細</string>
     <string name="add_plant">(translate me) Add plant</string>
     <string name="added_plant_to_garden">植物が庭に追加されました</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index f15402fc4..2bbe120ee 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -19,7 +19,6 @@
     <string name="plant_detail_image_content_description">Bitkinin görüntüsü</string>
     <string name="my_garden_title">Bahçem</string>
     <string name="plant_list_title">Bitki listesi</string>
-    <string name="available">(translate me) Available Plants</string>
     <string name="plant_details_title">Bitki detayları</string>
     <string name="add_plant">(translate me) Add plant</string>
     <string name="added_plant_to_garden">Bitki bahçeye eklendi</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0d8a71496..582f5acd3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -19,7 +19,6 @@
     <string name="plant_detail_image_content_description">植物图片</string>
     <string name="my_garden_title">我的花园</string>
     <string name="plant_list_title">植物目录</string>
-    <string name="available">植物品种</string>
     <string name="plant_details_title">植物介绍</string>
     <string name="add_plant">添加植物</string>
     <string name="added_plant_to_garden">添加了新植物</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2b805ca81..872d728e2 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -19,7 +19,6 @@
     <string name="plant_detail_image_content_description">植物圖片</string>
     <string name="my_garden_title">我的花園</string>
     <string name="plant_list_title">植物目錄</string>
-    <string name="available">植物品種</string>
     <string name="plant_details_title">植物介紹</string>
     <string name="add_plant">添加植物</string>
     <string name="added_plant_to_garden">添加了新植物</string>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fd5cfa81f..5cd82bc23 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -28,7 +28,6 @@
 
     <dimen name="margin_normal">16dp</dimen>
     <dimen name="margin_small">8dp</dimen>
-    <dimen name="margin_extra_small">4dp</dimen>
 
     <dimen name="plant_item_image_height">95dp</dimen>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1cbc497b6..b04f243a1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,7 +24,6 @@
     <string name="plant_detail_image_content_description" translation_description="Content description for the header / hero image that is show at the top of the plant detail screen.">Image of plant</string>
     <string name="my_garden_title" translation_description="Title for the 'My garden' screen where the user can see the list of plants that have been added to their garden.">My garden</string>
     <string name="plant_list_title" translation_description="Title for the plant list screen where the user can see a list of plants available to add to their garden.">Plant list</string>
-    <string name="available" translation_description="Text for the header of the plant list page indicating the available plants for users to choose from.">Available Plants</string>
     <string name="plant_details_title" translation_description="Title for the plant details screen where the user can see the details for a specific plant.">Plant details</string>
     <string name="add_plant" translation_description="Button text that prompts user to navigate to the Plant List to add plants to their empty garden.">Add plant</string>
     <string name="added_plant_to_garden" translation_description="Confirmation text that is shown when a user adds a plant to their empty garden.">Added plant to garden</string>
diff --git a/build.gradle b/build.gradle
index 197234ec5..188b05fe8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,30 +23,30 @@ buildscript {
         targetSdkVersion = 28
 
         // App dependencies
-        appCompatVersion = '1.1.0-beta01'
-        constraintLayoutVersion = '2.0.0-beta1'
+        appCompatVersion = '1.1.0'
+        constraintLayoutVersion = '2.0.0-beta2'
         coreTestingVersion = '2.0.0'
         coroutinesVersion = "1.3.0-M2"
         espressoVersion = '3.1.1'
-        fragmentVersion = '1.1.0-alpha09'
+        fragmentVersion = '1.2.0-alpha03'
         glideVersion = '4.9.0'
         gradleVersion = '3.5.0'
         gsonVersion = '2.8.2'
         junitVersion = '4.12'
         kotlinVersion = '1.3.41'
         ktlintVersion = '0.33.0'
-        ktxVersion = '1.0.2'
-        lifecycleVersion = '2.2.0-alpha01'
-        materialVersion = '1.1.0-alpha09'
-        navigationVersion = '2.0.0'
-        recyclerViewVersion = '1.1.0-alpha05'
+        ktxVersion = '1.2.0-alpha04'
+        lifecycleVersion = '2.2.0-alpha04'
+        materialVersion = '1.1.0-alpha10'
+        navigationVersion = '2.1.0'
+        recyclerViewVersion = '1.1.0-beta04'
         roomVersion = '2.1.0'
         runnerVersion = '1.0.1'
         truthVersion = '0.42'
         testExtJunit = '1.1.0'
         uiAutomatorVersion = '2.2.0'
-        viewPagerVersion = '1.0.0-beta03'
-        workVersion = '2.1.0'
+        viewPagerVersion = '1.0.0-beta04'
+        workVersion = '2.2.0'
     }
 
     repositories {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 234a2fd29..3374d054c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -16,6 +16,6 @@
 #Thu Aug 22 10:20:57 PDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists