diff --git a/admob/app/src/main/java/com/google/samples/quickstart/admobexample/java/MainActivity.java b/admob/app/src/main/java/com/google/samples/quickstart/admobexample/java/MainActivity.java
index 6070f39c4f..cd9b3a917d 100644
--- a/admob/app/src/main/java/com/google/samples/quickstart/admobexample/java/MainActivity.java
+++ b/admob/app/src/main/java/com/google/samples/quickstart/admobexample/java/MainActivity.java
@@ -60,7 +60,7 @@ protected void onCreate(Bundle savedInstanceState) {
         checkIds();
 
         // Initialize the Google Mobile Ads SDK
-        MobileAds.initialize(this, getString(R.string.admob_app_id));
+        MobileAds.initialize(this);
 
         mAdView = findViewById(R.id.adView);
         AdRequest adRequest = new AdRequest.Builder().build();
diff --git a/admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/MainActivity.kt b/admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/MainActivity.kt
index 272e6ed602..9f5d8a31a3 100644
--- a/admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/MainActivity.kt
+++ b/admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/MainActivity.kt
@@ -37,7 +37,7 @@ class MainActivity : AppCompatActivity() {
         checkIds()
 
         // Initialize the Google Mobile Ads SDK
-        MobileAds.initialize(this, getString(R.string.admob_app_id))
+        MobileAds.initialize(this)
 
         val adRequest = AdRequest.Builder().build()
 
diff --git a/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/java/MainActivity.java b/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/java/MainActivity.java
index cca67e274e..6b8bceb5bf 100644
--- a/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/java/MainActivity.java
+++ b/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/java/MainActivity.java
@@ -255,11 +255,14 @@ private void recordImageView() {
      * we change fragments.
      */
     private void recordScreenView() {
-        // This string must be <= 36 characters long in order for setCurrentScreen to succeed.
+        // This string must be <= 36 characters long.
         String screenName = getCurrentImageId() + "-" + getCurrentImageTitle();
 
         // [START set_current_screen]
-        mFirebaseAnalytics.setCurrentScreen(this, screenName, null /* class override */);
+        Bundle bundle = new Bundle();
+        bundle.putString(FirebaseAnalytics.Param.SCREEN_NAME, screenName);
+        bundle.putString(FirebaseAnalytics.Param.SCREEN_CLASS, "MainActivity");
+        mFirebaseAnalytics.logEvent(FirebaseAnalytics.Event.SCREEN_VIEW, bundle);
         // [END set_current_screen]
     }
 
diff --git a/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/kotlin/MainActivity.kt b/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/kotlin/MainActivity.kt
index c09a57cffa..f2c4dc4fd9 100644
--- a/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/kotlin/MainActivity.kt
+++ b/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/kotlin/MainActivity.kt
@@ -212,11 +212,14 @@ class MainActivity : AppCompatActivity() {
      * we change fragments.
      */
     private fun recordScreenView() {
-        // This string must be <= 36 characters long in order for setCurrentScreen to succeed.
+        // This string must be <= 36 characters long.
         val screenName = "${getCurrentImageId()}-${getCurrentImageTitle()}"
 
         // [START set_current_screen]
-        firebaseAnalytics.setCurrentScreen(this, screenName, null /* class override */)
+        firebaseAnalytics.logEvent(FirebaseAnalytics.Event.SCREEN_VIEW) {
+            param(FirebaseAnalytics.Param.SCREEN_NAME, screenName)
+            param(FirebaseAnalytics.Param.SCREEN_CLASS, "MainActivity")
+        }
         // [END set_current_screen]
     }