diff --git a/People/app/src/main/res/layout/bubble_activity.xml b/People/app/src/main/res/layout/bubble_activity.xml
index 6a766a07b..f0b4ad3a3 100644
--- a/People/app/src/main/res/layout/bubble_activity.xml
+++ b/People/app/src/main/res/layout/bubble_activity.xml
@@ -14,7 +14,7 @@
   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"
     android:id="@+id/container"
     android:layout_width="match_parent"
diff --git a/People/app/src/main/res/layout/main_activity.xml b/People/app/src/main/res/layout/main_activity.xml
index f781840b1..72c73a79c 100644
--- a/People/app/src/main/res/layout/main_activity.xml
+++ b/People/app/src/main/res/layout/main_activity.xml
@@ -67,7 +67,7 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <FrameLayout
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="0dp"