diff --git a/quickstep/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
index f5f5f9b130..9c4d4b7cae 100644
--- a/quickstep/src/com/android/launcher3/model/AppEventProducer.java
+++ b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
@@ -268,9 +268,13 @@ public class AppEventProducer implements StatsLogConsumer {
 
 
     private AppTarget createTempFolderTarget() {
-        return new AppTarget.Builder(new AppTargetId("folder:" + SystemClock.uptimeMillis()),
+        try {
+            return new AppTarget.Builder(new AppTargetId("folder:" + SystemClock.uptimeMillis()),
                 mContext.getPackageName(), Process.myUserHandle())
                 .build();
+        } catch (NoClassDefFoundError e) {
+            return null;
+        }
     }
 
     private String getContainer(LauncherAtom.ItemInfo info) {
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index ee5fe20d4c..be7756234d 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -4,6 +4,7 @@ import static com.android.launcher3.CellLayout.SPRING_LOADED_PROGRESS;
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_HEIGHT;
 import static com.android.launcher3.LauncherAnimUtils.LAYOUT_WIDTH;
 import static com.android.launcher3.LauncherPrefs.RECONFIGURABLE_WIDGET_EDUCATION_TIP_SEEN;
+import static com.android.launcher3.Utilities.ATLEAST_Q;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_RESIZE_COMPLETED;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_RESIZE_STARTED;
 import static com.android.launcher3.views.BaseDragLayer.LAYOUT_X;
@@ -211,6 +212,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
             mSystemGestureExclusionRects.get(i).set(dragHandle.getLeft(), dragHandle.getTop(),
                     dragHandle.getRight(), dragHandle.getBottom());
         }
+        if (!ATLEAST_Q) return;
         setSystemGestureExclusionRects(mSystemGestureExclusionRects);
     }
 
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 44ab966472..10c9fc6525 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher3.widget;
 
+import static com.android.launcher3.Utilities.ATLEAST_Q;
+
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.graphics.Rect;
@@ -123,8 +125,10 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView
         super.setAppWidget(appWidgetId, info);
         if (!mTrackingWidgetUpdate) {
             mTrackingWidgetUpdate = true;
-            Trace.beginAsyncSection(TRACE_METHOD_NAME + info.provider, appWidgetId);
             Log.i(TAG, "App widget created with id: " + appWidgetId);
+            if (ATLEAST_Q) {
+                Trace.beginAsyncSection(TRACE_METHOD_NAME + info.provider, appWidgetId);
+            }
         }
     }