diff --git a/android/smartreply/app/src/main/java/com/google/mlkit/samples/smartreply/java/chat/ChatFragment.java b/android/smartreply/app/src/main/java/com/google/mlkit/samples/smartreply/java/chat/ChatFragment.java
index 057c3cd171..b975080ecc 100644
--- a/android/smartreply/app/src/main/java/com/google/mlkit/samples/smartreply/java/chat/ChatFragment.java
+++ b/android/smartreply/app/src/main/java/com/google/mlkit/samples/smartreply/java/chat/ChatFragment.java
@@ -138,14 +138,14 @@ public void onClick(View view) {
             }
         });
 
-        mViewModel.getSuggestions().observe(this, new Observer<List<SmartReplySuggestion>>() {
+        mViewModel.getSuggestions().observe(getViewLifecycleOwner(), new Observer<List<SmartReplySuggestion>>() {
             @Override
             public void onChanged(List<SmartReplySuggestion> suggestions) {
                mChipAdapter.setSuggestions(suggestions);
             }
         });
 
-        mViewModel.getMessages().observe(this, new Observer<List<Message>>() {
+        mViewModel.getMessages().observe(getViewLifecycleOwner(), new Observer<List<Message>>() {
             @Override
             public void onChanged(List<Message> messages) {
                 mChatAdapter.setMessages(messages);
@@ -155,7 +155,7 @@ public void onChanged(List<Message> messages) {
             }
         });
 
-        mViewModel.getEmulatingRemoteUser().observe(this, new Observer<Boolean>() {
+        mViewModel.getEmulatingRemoteUser().observe(getViewLifecycleOwner(), new Observer<Boolean>() {
             @Override
             public void onChanged(Boolean isEmulatingRemoteUser) {
                 if (isEmulatingRemoteUser) {
diff --git a/android/translate/app/src/main/java/com/google/mlkit/samples/translate/java/TranslateFragment.java b/android/translate/app/src/main/java/com/google/mlkit/samples/translate/java/TranslateFragment.java
index 2a9760f8db..cf199ac17a 100644
--- a/android/translate/app/src/main/java/com/google/mlkit/samples/translate/java/TranslateFragment.java
+++ b/android/translate/app/src/main/java/com/google/mlkit/samples/translate/java/TranslateFragment.java
@@ -76,8 +76,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         final Spinner sourceLangSelector = view.findViewById(R.id.sourceLangSelector);
         final Spinner targetLangSelector = view.findViewById(R.id.targetLangSelector);
 
-        final TranslateViewModel viewModel =
-                ViewModelProviders.of(this).get(TranslateViewModel.class);
+        final TranslateViewModel viewModel = ViewModelProviders.of(this).get(TranslateViewModel.class);
 
         // Get available language list and set up source and target language spinners
         // with default selections.
@@ -162,7 +161,7 @@ public void afterTextChanged(Editable s) {
                 viewModel.sourceText.postValue(s.toString());
             }
         });
-        viewModel.translatedText.observe(this, new Observer<TranslateViewModel.ResultOrError>() {
+        viewModel.translatedText.observe(getViewLifecycleOwner(), new Observer<TranslateViewModel.ResultOrError>() {
             @Override
             public void onChanged(TranslateViewModel.ResultOrError resultOrError) {
                 if (resultOrError.error != null) {
@@ -174,7 +173,7 @@ public void onChanged(TranslateViewModel.ResultOrError resultOrError) {
         });
 
         // Update sync toggle button states based on downloaded models list.
-        viewModel.availableModels.observe(this, new Observer<List<String>>() {
+        viewModel.availableModels.observe(getViewLifecycleOwner(), new Observer<List<String>>() {
             @Override
             public void onChanged(@Nullable List<String> translateRemoteModels) {
                 String output = getContext().getString(R.string.downloaded_models_label,
diff --git a/android/translate/app/src/main/java/com/google/mlkit/samples/translate/kotlin/TranslateFragment.kt b/android/translate/app/src/main/java/com/google/mlkit/samples/translate/kotlin/TranslateFragment.kt
index 679f2c6b8c..b55e1dd96f 100644
--- a/android/translate/app/src/main/java/com/google/mlkit/samples/translate/kotlin/TranslateFragment.kt
+++ b/android/translate/app/src/main/java/com/google/mlkit/samples/translate/kotlin/TranslateFragment.kt
@@ -148,7 +148,7 @@ class TranslateFragment : Fragment() {
             }
         })
 
-        viewModel.translatedText.observe(this, Observer { resultOrError ->
+        viewModel.translatedText.observe(viewLifecycleOwner, Observer { resultOrError ->
             resultOrError?.let {
                 if (it.error != null) {
                     sourceText.error = resultOrError.error?.localizedMessage
@@ -159,7 +159,7 @@ class TranslateFragment : Fragment() {
         })
 
         // Update sync toggle button states based on downloaded models list.
-        viewModel.availableModels.observe(this, Observer { translateRemoteModels ->
+        viewModel.availableModels.observe(viewLifecycleOwner, Observer { translateRemoteModels ->
             val output = context!!.getString(
                     R.string.downloaded_models_label, translateRemoteModels
             )