diff --git a/gma/integration_test/AndroidManifest.xml b/gma/integration_test/AndroidManifest.xml
index c45d3ff5e5..c78d377fae 100644
--- a/gma/integration_test/AndroidManifest.xml
+++ b/gma/integration_test/AndroidManifest.xml
@@ -23,12 +23,14 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
-  <application android:label="@string/app_name">
+  <application android:label="@string/app_name"
+    android:taskAffinity="">
     <!-- You may replace the sample App ID below with your own App ID. -->
     <meta-data
         android:name="com.google.android.gms.ads.APPLICATION_ID"
         android:value="ca-app-pub-3940256099942544~3347511713"/>
     <activity android:name="android.app.NativeActivity"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/gma/src_java/com/google/firebase/gma/internal/cpp/AdInspectorHelper.java b/gma/src_java/com/google/firebase/gma/internal/cpp/AdInspectorHelper.java
index 9d7e1add66..1f706f5e3c 100644
--- a/gma/src_java/com/google/firebase/gma/internal/cpp/AdInspectorHelper.java
+++ b/gma/src_java/com/google/firebase/gma/internal/cpp/AdInspectorHelper.java
@@ -16,10 +16,8 @@
 
 package com.google.firebase.gma.internal.cpp;
 
-import android.util.Log;
 import com.google.android.gms.ads.AdError;
 import com.google.android.gms.ads.AdInspectorError;
-import com.google.android.gms.ads.MobileAds;
 import com.google.android.gms.ads.OnAdInspectorClosedListener;
 
 /** Helper class for listening to AdInspector closed events. */
@@ -28,17 +26,17 @@ public final class AdInspectorHelper implements OnAdInspectorClosedListener {
    * Pointer to the C++ AdInspectorClosedListener object to invoke when the AdInspector has been
    * closed.
    */
-  private long mNativeCallbackPtr;
+  private final long nativeCallbackPtr;
 
   /** Constructor. */
   AdInspectorHelper(long nativeCallbackPtr) {
-    mNativeCallbackPtr = nativeCallbackPtr;
+    this.nativeCallbackPtr = nativeCallbackPtr;
   }
 
   /** Method that the Android GMA SDK invokes when the AdInspector has been closed. */
   @Override
   public void onAdInspectorClosed(AdInspectorError error) {
-    adInspectorClosedCallback(mNativeCallbackPtr, error);
+    adInspectorClosedCallback(nativeCallbackPtr, error);
   }
 
   /**
diff --git a/gma/src_java/com/google/firebase/gma/internal/cpp/AdRequestHelper.java b/gma/src_java/com/google/firebase/gma/internal/cpp/AdRequestHelper.java
index a06d0a4674..d4d2fcdbd6 100644
--- a/gma/src_java/com/google/firebase/gma/internal/cpp/AdRequestHelper.java
+++ b/gma/src_java/com/google/firebase/gma/internal/cpp/AdRequestHelper.java
@@ -16,6 +16,7 @@
 
 package com.google.firebase.gma.internal.cpp;
 
+import androidx.annotation.Nullable;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -35,6 +36,7 @@ public AdRequestHelper() {}
    * @param day The day to use in creating the Date object
    * @return A Date object with the appropriate date
    */
+  @Nullable
   public Date createDate(int year, int month, int day) {
     try {
       Calendar cal = Calendar.getInstance();
diff --git a/gma/src_java/com/google/firebase/gma/internal/cpp/AdViewHelper.java b/gma/src_java/com/google/firebase/gma/internal/cpp/AdViewHelper.java
index 5c91977228..1d98cfa321 100644
--- a/gma/src_java/com/google/firebase/gma/internal/cpp/AdViewHelper.java
+++ b/gma/src_java/com/google/firebase/gma/internal/cpp/AdViewHelper.java
@@ -20,7 +20,6 @@
 import android.graphics.drawable.ColorDrawable;
 import android.os.Handler;
 import android.os.Looper;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
@@ -56,123 +55,118 @@ public class AdViewHelper implements ViewTreeObserver.OnPreDrawListener {
   private static final int WEBVIEW_DELAY_MILLISECONDS = 200;
 
   // Pointer to the AdViewInternalAndroid object that created this object.
-  private long mAdViewInternalPtr;
+  private long adViewInternalPtr;
 
   // The GMA SDK AdView associated with this helper.
-  private AdView mAdView;
+  private AdView adView;
 
-  // Flag indicating whether an ad is showing in mAdView.
-  private boolean mAdViewContainsAd;
+  // Flag indicating whether an ad is showing in adView.
+  private boolean adViewContainsAd;
 
   // Flag indicating that the Bounding Box listener callback should be invoked
-  // the next time mAdView's OnPreDrawListener gets an OnPreDraw event.
-  private AtomicBoolean mNotifyBoundingBoxListenerOnNextDraw;
+  // the next time adView's OnPreDrawListener gets an OnPreDraw event.
+  private final AtomicBoolean notifyBoundingBoxListenerOnNextDraw;
 
   // The {@link Activity} this helper uses to display its {@link AdView}.
-  private Activity mActivity;
+  private Activity activity;
 
   // The ad unit ID to use for the {@link AdView}.
-  private String mAdUnitId;
+  private String adUnitId;
 
   // Pointer to a FutureCallbackData in the C++ wrapper that will be used to
   // complete the Future associated with the latest call to LoadAd.
-  private long mLoadAdCallbackDataPtr;
+  private long loadAdCallbackDataPtr;
 
   // Synchronization object for thread safe access to:
-  // * mAdViewInternalPtr
-  // * mLoadAdCallbackDataPtr
-  private final Object mAdViewLock;
+  // * adViewInternalPtr
+  // * loadAdCallbackDataPtr
+  private final Object adViewLock;
 
   // {@link PopupWindow } that will contain the {@link AdView}. This is done to
   // guarantee the ad is drawn properly even when the application uses a
   // {@link android.app.NativeActivity}.
-  private PopupWindow mPopUp;
+  private PopupWindow popUp;
 
   // Runnable that is trigged to show the Ad {@link PopupWindow}.
   // When this is set to null, the popup should not be shown.
-  private Runnable mPopUpRunnable;
+  private Runnable popUpRunnable;
 
   // Lock used to synchronize the state of the popup window.
-  private final Object mPopUpLock;
+  private final Object popUpLock;
 
   // Number of times the AdViewHelper object has attempted to show the popup window before the
   // activity has focus.
-  private int mPopUpShowRetryCount;
+  private int popUpShowRetryCount;
 
   // Flag indicating whether the {@link AdView} is currently intended to be
   // positioned with (x,y) coordinates rather than one of the pre-defined
   // positions (such as ConstantsHelper.AD_VIEW_POSITION_TOP_LEFT).
-  private boolean mShouldUseXYForPosition;
+  private boolean shouldUseXYForPosition;
 
   // The user's desired pre-defined position for the {@link AdView}.
-  private int mDesiredPosition;
+  private int desiredPosition;
 
   // The user's desired pre-defined X coordinate for the {@link AdView}.
-  private int mDesiredX;
+  private int desiredX;
 
   // The user's desired pre-defined Y coordinate for the {@link AdView}.
-  private int mDesiredY;
-
-  /**
-   * Constructor.
-   */
-  public AdViewHelper(long AdViewInternalPtr, AdView adView) {
-    mAdViewInternalPtr = AdViewInternalPtr;
-    mAdView = adView;
-    mDesiredPosition = ConstantsHelper.AD_VIEW_POSITION_TOP_LEFT;
-    mShouldUseXYForPosition = false;
-    mAdViewContainsAd = false;
-    mNotifyBoundingBoxListenerOnNextDraw = new AtomicBoolean(false);
-    mAdViewLock = new Object();
-    mPopUpLock = new Object();
-    mPopUpShowRetryCount = 0;
+  private int desiredY;
+
+  /** Constructor. */
+  public AdViewHelper(long adViewInternalPtr, AdView adView) {
+    this.adViewInternalPtr = adViewInternalPtr;
+    this.adView = adView;
+    desiredPosition = ConstantsHelper.AD_VIEW_POSITION_TOP_LEFT;
+    shouldUseXYForPosition = false;
+    adViewContainsAd = false;
+    notifyBoundingBoxListenerOnNextDraw = new AtomicBoolean(false);
+    adViewLock = new Object();
+    popUpLock = new Object();
+    popUpShowRetryCount = 0;
   }
 
   /**
-   * Initializes the {@link AdView}. This stores the activity for use with
-   * callback and load operations.
+   * Initializes the {@link AdView}. This stores the activity for use with callback and load
+   * operations.
    */
-
   public void initialize(Activity activity) {
-    mActivity = activity;
+    this.activity = activity;
   }
 
-  /**
-   * Destroy/deallocate the {@link PopupWindow} and {@link AdView}.
-   */
-  public void destroy(final long callbackDataPtr, final boolean destructor_invocation) {
+  /** Destroy/deallocate the {@link PopupWindow} and {@link AdView}. */
+  public void destroy(final long callbackDataPtr, final boolean destructorInvocation) {
     // If the Activity isn't initialized, or already Destroyed, then there's
     // nothing to destroy.
-    if (mActivity != null) {
-      mActivity.runOnUiThread(new Runnable() {
+    if (activity != null) {
+      activity.runOnUiThread(new Runnable() {
         @Override
         public void run() {
           // Stop any attempts to show the popup window.
-          synchronized (mPopUpLock) {
-            mPopUpRunnable = null;
+          synchronized (popUpLock) {
+            popUpRunnable = null;
           }
 
-          if (mAdView != null) {
-            mAdView.setAdListener(null);
-            mAdView.setOnPaidEventListener(null);
-            mAdView.destroy();
-            mAdView = null;
+          if (adView != null) {
+            adView.setAdListener(null);
+            adView.setOnPaidEventListener(null);
+            adView.destroy();
+            adView = null;
           }
 
-          synchronized (mPopUpLock) {
-            if (mPopUp != null) {
-              mPopUp.dismiss();
-              mPopUp = null;
+          synchronized (popUpLock) {
+            if (popUp != null) {
+              popUp.dismiss();
+              popUp = null;
             }
           }
-          synchronized (mAdViewLock) {
-            if (destructor_invocation == false) {
-              notifyBoundingBoxChanged(mAdViewInternalPtr);
+          synchronized (adViewLock) {
+            if (destructorInvocation == false) {
+              notifyBoundingBoxChanged(adViewInternalPtr);
             }
-            mAdViewInternalPtr = CPP_NULLPTR;
+            adViewInternalPtr = CPP_NULLPTR;
           }
-          mActivity = null;
-          if (destructor_invocation) {
+          activity = null;
+          if (destructorInvocation) {
             // AdViews's C++ destructor does not pass a future
             // to callback and complete, but the reference to this object
             // which should be released.
@@ -191,133 +185,119 @@ public void run() {
     }
   }
 
-  /**
-   * Loads an ad for the underlying AdView object.
-   */
+  /** Loads an ad for the underlying AdView object. */
   public void loadAd(long callbackDataPtr, final AdRequest request) {
-    if (mActivity == null) {
+    if (activity == null) {
       return;
     }
 
-    synchronized (mAdViewLock) {
-      if (mLoadAdCallbackDataPtr != CPP_NULLPTR) {
+    synchronized (adViewLock) {
+      if (loadAdCallbackDataPtr != CPP_NULLPTR) {
         completeAdViewLoadAdInternalError(callbackDataPtr,
             ConstantsHelper.CALLBACK_ERROR_LOAD_IN_PROGRESS,
             ConstantsHelper.CALLBACK_ERROR_MESSAGE_LOAD_IN_PROGRESS);
         return;
       }
-      mLoadAdCallbackDataPtr = callbackDataPtr;
+      loadAdCallbackDataPtr = callbackDataPtr;
     }
 
-    if (mAdView == null) {
-      synchronized (mAdViewLock) {
-        completeAdViewLoadAdInternalError(mLoadAdCallbackDataPtr,
+    if (adView == null) {
+      synchronized (adViewLock) {
+        completeAdViewLoadAdInternalError(loadAdCallbackDataPtr,
             ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED,
             ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED);
-        mLoadAdCallbackDataPtr = CPP_NULLPTR;
+        loadAdCallbackDataPtr = CPP_NULLPTR;
       }
     } else {
-      mAdView.loadAd(request);
+      adView.loadAd(request);
     }
   }
 
-  /**
-   * Hides the {@link AdView}.
-   */
+  /** Hides the {@link AdView}. */
   public void hide(final long callbackDataPtr) {
-    if (mActivity == null) {
+    if (activity == null) {
       return;
     }
 
     int errorCode;
     String errorMessage;
 
-    synchronized (mPopUpLock) {
+    synchronized (popUpLock) {
       // Stop any attempts to show the popup window.
-      mPopUpRunnable = null;
+      popUpRunnable = null;
 
-      if (mAdView == null || mPopUp == null) {
+      if (adView == null || popUp == null) {
         errorCode = ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED;
         errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED;
       } else {
         errorCode = ConstantsHelper.CALLBACK_ERROR_NONE;
         errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_NONE;
-        mPopUp.dismiss();
-        mPopUp = null;
+        popUp.dismiss();
+        popUp = null;
       }
     }
 
     completeAdViewFutureCallback(callbackDataPtr, errorCode, errorMessage);
   }
 
-  /**
-   * Shows the {@link AdView}.
-   */
+  /** Shows the {@link AdView}. */
   public void show(final long callbackDataPtr) {
-    if (mActivity == null) {
+    if (activity == null) {
       return;
     }
-    updatePopUpLocation(callbackDataPtr);
+    boolean unused = updatePopUpLocation(callbackDataPtr);
   }
 
-  /**
-   * Pauses the {@link AdView}.
-   */
+  /** Pauses the {@link AdView}. */
   public void pause(final long callbackDataPtr) {
-    if (mActivity == null) {
+    if (activity == null) {
       return;
-    } else if (mAdView != null) {
-      mAdView.pause();
+    } else if (adView != null) {
+      adView.pause();
     }
     completeAdViewFutureCallback(callbackDataPtr, ConstantsHelper.CALLBACK_ERROR_NONE,
         ConstantsHelper.CALLBACK_ERROR_MESSAGE_NONE);
   }
 
-  /**
-   * Resume the {@link AdView} (from a pause).
-   */
+  /** Resume the {@link AdView} (from a pause). */
   public void resume(final long callbackDataPtr) {
-    if (mActivity == null) {
+    if (activity == null) {
       return;
-    } else if (mAdView != null) {
-      mAdView.resume();
+    } else if (adView != null) {
+      adView.resume();
     }
 
     completeAdViewFutureCallback(callbackDataPtr, ConstantsHelper.CALLBACK_ERROR_NONE,
         ConstantsHelper.CALLBACK_ERROR_MESSAGE_NONE);
   }
 
-  /**
-   * Moves the {@link AdView} to the provided (x,y) screen coordinates.
-   */
+  /** Moves the {@link AdView} to the provided (x,y) screen coordinates. */
   public void moveTo(final long callbackDataPtr, int x, int y) {
-    if (mActivity == null) {
+    if (activity == null) {
       return;
     }
 
-    synchronized (mPopUpLock) {
-      mShouldUseXYForPosition = true;
-      mDesiredX = x;
-      mDesiredY = y;
-      if (mPopUp != null) {
-        updatePopUpLocation(callbackDataPtr);
+    synchronized (popUpLock) {
+      shouldUseXYForPosition = true;
+      desiredX = x;
+      desiredY = y;
+      if (popUp != null) {
+        boolean unused = updatePopUpLocation(callbackDataPtr);
       }
     }
   }
 
-  /**
-   * Moves the {@link AdView} to the provided screen position.
-   */
+  /** Moves the {@link AdView} to the provided screen position. */
   public void moveTo(final long callbackDataPtr, final int position) {
-    if (mActivity == null) {
+    if (activity == null) {
       return;
     }
 
-    synchronized (mPopUpLock) {
-      mShouldUseXYForPosition = false;
-      mDesiredPosition = position;
-      if (mPopUp != null) {
-        updatePopUpLocation(callbackDataPtr);
+    synchronized (popUpLock) {
+      shouldUseXYForPosition = false;
+      desiredPosition = position;
+      if (popUp != null) {
+        boolean unused = updatePopUpLocation(callbackDataPtr);
       }
     }
   }
@@ -327,21 +307,21 @@ public void moveTo(final long callbackDataPtr, final int position) {
    * y-coordinate of the {@link AdView}. These values make up the AdView's BoundingBox.
    */
   public int[] getBoundingBox() {
-    synchronized (mPopUpLock) {
+    synchronized (popUpLock) {
       int width = -1;
       int height = -1;
       int x = -1;
       int y = -1;
-      if (mPopUp != null) {
+      if (popUp != null) {
         int[] onScreenLocation = new int[2];
-        mPopUp.getContentView().getLocationOnScreen(onScreenLocation);
+        popUp.getContentView().getLocationOnScreen(onScreenLocation);
         x = onScreenLocation[0];
         y = onScreenLocation[1];
 
-        if (mAdView != null) {
-          if (mPopUp.isShowing()) {
-            width = mAdView.getWidth();
-            height = mAdView.getHeight();
+        if (adView != null) {
+          if (popUp.isShowing()) {
+            width = adView.getWidth();
+            height = adView.getHeight();
           } else {
             width = height = 0;
           }
@@ -351,14 +331,12 @@ public int[] getBoundingBox() {
     }
   }
 
-  /**
-   * Returns an integer representation of the AdView's position.
-   */
+  /** Returns an integer representation of the AdView's position. */
   public int getPosition() {
-    if (mAdView == null || mShouldUseXYForPosition) {
+    if (adView == null || shouldUseXYForPosition) {
       return ConstantsHelper.AD_VIEW_POSITION_UNDEFINED;
     }
-    return mDesiredPosition;
+    return desiredPosition;
   }
 
   /**
@@ -370,40 +348,40 @@ public int getPosition() {
    * @return true if successful, false otherwise.
    */
   private boolean updatePopUpLocation(final long callbackDataPtr) {
-    if (mActivity == null) {
+    if (activity == null) {
       return false;
     }
-    final View view = mActivity.findViewById(android.R.id.content);
+    final View view = activity.findViewById(android.R.id.content);
     if (view == null) {
       return false;
     }
 
-    // If mActivity's content view doesn't have a window token, it will be
+    // If activity's content view doesn't have a window token, it will be
     // impossible to update or display the popup later in this method. This is
-    // a rare case caused by mActivity spinning up or winding down, but it will
+    // a rare case caused by activity spinning up or winding down, but it will
     // cause the WindowManager to crash.
     final View root = view.getRootView();
     if (root == null || root.getWindowToken() == null) {
       return false;
     }
 
-    synchronized (mPopUpLock) {
-      if (mPopUp != null) {
-        mActivity.runOnUiThread(new Runnable() {
+    synchronized (popUpLock) {
+      if (popUp != null) {
+        activity.runOnUiThread(new Runnable() {
           @Override
           public void run() {
-            synchronized (mPopUpLock) {
+            synchronized (popUpLock) {
               // Any change in visibility or position results in the dismissal of the popup (if
               // one is being displayed) and creation of a fresh one.
-              mPopUp.dismiss();
-              mPopUp = null;
+              popUp.dismiss();
+              popUp = null;
             }
           }
         });
       }
 
-      mPopUpShowRetryCount = 0;
-      mPopUpRunnable = new Runnable() {
+      popUpShowRetryCount = 0;
+      popUpRunnable = new Runnable() {
         @Override
         public void run() {
           int errorCode = ConstantsHelper.CALLBACK_ERROR_NONE;
@@ -411,15 +389,15 @@ public void run() {
           // If the Activity's window doesn't currently have focus it's not
           // possible to display the popup window. Poll the focus after a delay of 10ms and try
           // to show the popup again.
-          if (!mActivity.hasWindowFocus()) {
-            synchronized (mPopUpLock) {
-              if (mPopUpRunnable == null) {
+          if (!activity.hasWindowFocus()) {
+            synchronized (popUpLock) {
+              if (popUpRunnable == null) {
                 errorCode = ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED;
                 errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED;
               } else {
-                if (mPopUpShowRetryCount < POPUP_SHOW_RETRY_COUNT) {
-                  mPopUpShowRetryCount++;
-                  new Handler().postDelayed(mPopUpRunnable, 10);
+                if (popUpShowRetryCount < POPUP_SHOW_RETRY_COUNT) {
+                  popUpShowRetryCount++;
+                  new Handler().postDelayed(popUpRunnable, 10);
                   return;
                 }
                 errorCode = ConstantsHelper.CALLBACK_ERROR_NO_WINDOW_TOKEN;
@@ -428,7 +406,7 @@ public void run() {
             }
           }
 
-          if (mAdView == null) {
+          if (adView == null) {
             errorCode = ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED;
             errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED;
           }
@@ -436,42 +414,42 @@ public void run() {
           if (errorCode != ConstantsHelper.CALLBACK_ERROR_NONE) {
             completeAdViewFutureCallback(callbackDataPtr, errorCode, errorMessage);
             return;
-          } else if (mPopUp == null) {
-            mPopUp = new PopupWindow(mAdView, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-            mPopUp.setBackgroundDrawable(new ColorDrawable(0xFF000000)); // Black
-            mAdView.getViewTreeObserver().addOnPreDrawListener(AdViewHelper.this);
+          } else if (popUp == null) {
+            popUp = new PopupWindow(adView, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+            popUp.setBackgroundDrawable(new ColorDrawable(0xFF000000)); // Black
+            adView.getViewTreeObserver().addOnPreDrawListener(AdViewHelper.this);
 
-            if (mShouldUseXYForPosition) {
-              mPopUp.showAtLocation(root, Gravity.NO_GRAVITY, mDesiredX, mDesiredY);
+            if (shouldUseXYForPosition) {
+              popUp.showAtLocation(root, Gravity.NO_GRAVITY, desiredX, desiredY);
             } else {
-              switch (mDesiredPosition) {
+              switch (desiredPosition) {
                 case ConstantsHelper.AD_VIEW_POSITION_TOP:
-                  mPopUp.showAtLocation(root, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 0, 0);
+                  popUp.showAtLocation(root, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 0, 0);
                   break;
                 case ConstantsHelper.AD_VIEW_POSITION_BOTTOM:
-                  mPopUp.showAtLocation(root, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, 0);
+                  popUp.showAtLocation(root, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, 0);
                   break;
                 case ConstantsHelper.AD_VIEW_POSITION_TOP_LEFT:
-                  mPopUp.showAtLocation(root, Gravity.TOP | Gravity.LEFT, 0, 0);
+                  popUp.showAtLocation(root, Gravity.TOP | Gravity.LEFT, 0, 0);
                   break;
                 case ConstantsHelper.AD_VIEW_POSITION_TOP_RIGHT:
-                  mPopUp.showAtLocation(root, Gravity.TOP | Gravity.RIGHT, 0, 0);
+                  popUp.showAtLocation(root, Gravity.TOP | Gravity.RIGHT, 0, 0);
                   break;
                 case ConstantsHelper.AD_VIEW_POSITION_BOTTOM_LEFT:
-                  mPopUp.showAtLocation(root, Gravity.BOTTOM | Gravity.LEFT, 0, 0);
+                  popUp.showAtLocation(root, Gravity.BOTTOM | Gravity.LEFT, 0, 0);
                   break;
                 case ConstantsHelper.AD_VIEW_POSITION_BOTTOM_RIGHT:
-                  mPopUp.showAtLocation(root, Gravity.BOTTOM | Gravity.RIGHT, 0, 0);
+                  popUp.showAtLocation(root, Gravity.BOTTOM | Gravity.RIGHT, 0, 0);
                   break;
                 default:
-                  mPopUp.showAtLocation(root, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 0, 0);
+                  popUp.showAtLocation(root, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 0, 0);
                   break;
               }
             }
           }
 
           completeAdViewFutureCallback(callbackDataPtr, errorCode, errorMessage);
-          mNotifyBoundingBoxListenerOnNextDraw.set(true);
+          notifyBoundingBoxListenerOnNextDraw.set(true);
         }
       };
     }
@@ -479,17 +457,18 @@ public void run() {
     // TODO(b/31391149): This delay is a workaround for b/31391149, and should be removed once
     // that bug is resolved.
     Handler mainHandler = new Handler(Looper.getMainLooper());
-    mainHandler.postDelayed(mPopUpRunnable, WEBVIEW_DELAY_MILLISECONDS);
+    mainHandler.postDelayed(popUpRunnable, WEBVIEW_DELAY_MILLISECONDS);
 
     return true;
   }
 
+  /** A listener for receiving notifications during the lifecycle of a BannerAd. */
   public class AdViewListener extends AdListener implements OnPaidEventListener {
     @Override
     public void onAdClicked() {
-      synchronized (mAdViewLock) {
-        if (mAdViewInternalPtr != CPP_NULLPTR) {
-          notifyAdClicked(mAdViewInternalPtr);
+      synchronized (adViewLock) {
+        if (adViewInternalPtr != CPP_NULLPTR) {
+          notifyAdClicked(adViewInternalPtr);
         }
       }
       super.onAdClicked();
@@ -497,10 +476,10 @@ public void onAdClicked() {
 
     @Override
     public void onAdClosed() {
-      synchronized (mAdViewLock) {
-        if (mAdViewInternalPtr != CPP_NULLPTR) {
-          notifyAdClosed(mAdViewInternalPtr);
-          mNotifyBoundingBoxListenerOnNextDraw.set(true);
+      synchronized (adViewLock) {
+        if (adViewInternalPtr != CPP_NULLPTR) {
+          notifyAdClosed(adViewInternalPtr);
+          notifyBoundingBoxListenerOnNextDraw.set(true);
         }
       }
       super.onAdClosed();
@@ -508,11 +487,11 @@ public void onAdClosed() {
 
     @Override
     public void onAdFailedToLoad(LoadAdError loadAdError) {
-      synchronized (mAdViewLock) {
-        if (mLoadAdCallbackDataPtr != CPP_NULLPTR) {
+      synchronized (adViewLock) {
+        if (loadAdCallbackDataPtr != CPP_NULLPTR) {
           completeAdViewLoadAdError(
-              mLoadAdCallbackDataPtr, loadAdError, loadAdError.getCode(), loadAdError.getMessage());
-          mLoadAdCallbackDataPtr = CPP_NULLPTR;
+              loadAdCallbackDataPtr, loadAdError, loadAdError.getCode(), loadAdError.getMessage());
+          loadAdCallbackDataPtr = CPP_NULLPTR;
         }
       }
       super.onAdFailedToLoad(loadAdError);
@@ -520,9 +499,9 @@ public void onAdFailedToLoad(LoadAdError loadAdError) {
 
     @Override
     public void onAdImpression() {
-      synchronized (mAdViewLock) {
-        if (mAdViewInternalPtr != CPP_NULLPTR) {
-          notifyAdImpression(mAdViewInternalPtr);
+      synchronized (adViewLock) {
+        if (adViewInternalPtr != CPP_NULLPTR) {
+          notifyAdImpression(adViewInternalPtr);
         }
       }
       super.onAdImpression();
@@ -530,20 +509,20 @@ public void onAdImpression() {
 
     @Override
     public void onAdLoaded() {
-      synchronized (mAdViewLock) {
-        if (mAdView != null) {
-          mAdViewContainsAd = true;
+      synchronized (adViewLock) {
+        if (adView != null) {
+          adViewContainsAd = true;
         }
-        if (mLoadAdCallbackDataPtr != CPP_NULLPTR) {
-          AdSize adSize = mAdView.getAdSize();
-          completeAdViewLoadedAd(mLoadAdCallbackDataPtr, mAdViewInternalPtr, adSize.getWidth(),
-              adSize.getHeight(), mAdView.getResponseInfo());
-          mLoadAdCallbackDataPtr = CPP_NULLPTR;
+        if (loadAdCallbackDataPtr != CPP_NULLPTR) {
+          AdSize adSize = adView.getAdSize();
+          completeAdViewLoadedAd(loadAdCallbackDataPtr, adViewInternalPtr, adSize.getWidth(),
+              adSize.getHeight(), adView.getResponseInfo());
+          loadAdCallbackDataPtr = CPP_NULLPTR;
         }
         // Only update the bounding box if the banner view is already visible.
-        if (mPopUp != null && mPopUp.isShowing()) {
+        if (popUp != null && popUp.isShowing()) {
           // Loading an ad can sometimes cause the bounds to change.
-          mNotifyBoundingBoxListenerOnNextDraw.set(true);
+          notifyBoundingBoxListenerOnNextDraw.set(true);
         }
       }
       super.onAdLoaded();
@@ -551,19 +530,20 @@ public void onAdLoaded() {
 
     @Override
     public void onAdOpened() {
-      synchronized (mAdViewLock) {
-        if (mAdViewInternalPtr != CPP_NULLPTR) {
-          notifyAdOpened(mAdViewInternalPtr);
+      synchronized (adViewLock) {
+        if (adViewInternalPtr != CPP_NULLPTR) {
+          notifyAdOpened(adViewInternalPtr);
         }
-        mNotifyBoundingBoxListenerOnNextDraw.set(true);
+        notifyBoundingBoxListenerOnNextDraw.set(true);
       }
       super.onAdOpened();
     }
 
+    @Override
     public void onPaidEvent(AdValue value) {
-      synchronized (mAdViewLock) {
-        if (mAdViewInternalPtr != CPP_NULLPTR) {
-          notifyPaidEvent(mAdViewInternalPtr, value.getCurrencyCode(), value.getPrecisionType(),
+      synchronized (adViewLock) {
+        if (adViewInternalPtr != CPP_NULLPTR) {
+          notifyPaidEvent(adViewInternalPtr, value.getCurrencyCode(), value.getPrecisionType(),
               value.getValueMicros());
         }
       }
@@ -572,87 +552,67 @@ public void onPaidEvent(AdValue value) {
 
   /**
    * Implementation of ViewTreeObserver.OnPreDrawListener's onPreDraw method. This gets called when
-   * mAdView is about to be redrawn, and checks a flag before invoking the native callback that
-   * tells the C++ side a Bounding Box change has occurred and the AdView::Listener (if there is
-   * one) needs to be notified.
+   * adView is about to be redrawn, and checks a flag before invoking the native callback that tells
+   * the C++ side a Bounding Box change has occurred and the AdView::Listener (if there is one)
+   * needs to be notified.
    *
-   * <p>By invoking the listener callback here, hooked into the draw loop, the AdViewHelper
-   * object can be sure that any movements of mAdView have been completed and the layout and screen
-   * position have been recalculated by the time the notification happens, preventing stale data
-   * from getting to the Listener.
+   * <p>By invoking the listener callback here, hooked into the draw loop, the AdViewHelper object
+   * can be sure that any movements of adView have been completed and the layout and screen position
+   * have been recalculated by the time the notification happens, preventing stale data from getting
+   * to the Listener.
    */
   @Override
   public boolean onPreDraw() {
-    if (mNotifyBoundingBoxListenerOnNextDraw.compareAndSet(true, false)) {
-      if (mAdView != null && mAdViewInternalPtr != CPP_NULLPTR) {
-        notifyBoundingBoxChanged(mAdViewInternalPtr);
+    if (notifyBoundingBoxListenerOnNextDraw.compareAndSet(true, false)) {
+      if (adView != null && adViewInternalPtr != CPP_NULLPTR) {
+        notifyBoundingBoxChanged(adViewInternalPtr);
       }
     }
     // Returning true tells Android to continue the draw as normal.
     return true;
   }
 
-  /**
-   * Native callback to instruct the C++ wrapper to complete the corresponding future.
-   */
+  /** Native callback to instruct the C++ wrapper to complete the corresponding future. */
   public static native void completeAdViewFutureCallback(
       long nativeInternalPtr, int errorCode, String errorMessage);
 
-  /**
-   * Native callback to instruct the C++ wrapper to release its global reference on this
-   * object.
-   */
+  /** Native callback to instruct the C++ wrapper to release its global reference on this object. */
   public static native void releaseAdViewGlobalReferenceCallback(long nativeInternalPtr);
 
-  /**
-   * Native callback invoked upon successfully loading an ad.
-   */
+  /** Native callback invoked upon successfully loading an ad. */
   public static native void completeAdViewLoadedAd(long nativeInternalPtr, long mAdViewInternalPtr,
       int width, int height, ResponseInfo responseInfo);
 
   /**
-   * Native callback upon encountering an error loading an Ad Request. Returns
-   * Android Google Mobile Ads SDK error codes.
-   **/
+   * Native callback upon encountering an error loading an Ad Request. Returns Android Google Mobile
+   * Ads SDK error codes.
+   */
   public static native void completeAdViewLoadAdError(
       long nativeInternalPtr, LoadAdError error, int errorCode, String errorMessage);
 
   /**
-   * Native callback upon encountering a wrapper/internal error when
-   * processing a Load Ad Request. Returns an integer representing
-   * firebase::gma::AdError codes.
+   * Native callback upon encountering a wrapper/internal error when processing a Load Ad Request.
+   * Returns an integer representing firebase::gma::AdError codes.
    */
   public static native void completeAdViewLoadAdInternalError(
       long nativeInternalPtr, int gmaErrorCode, String errorMessage);
 
-  /**
-   * Native callback to notify the C++ wrapper that the Ad's Bounding Box has changed.
-   */
+  /** Native callback to notify the C++ wrapper that the Ad's Bounding Box has changed. */
   public static native void notifyBoundingBoxChanged(long nativeInternalPtr);
 
-  /**
-   * Native callback to notify the C++ wrapper of an ad clicked event
-   */
+  /** Native callback to notify the C++ wrapper of an ad clicked event */
   public static native void notifyAdClicked(long nativeInternalPtr);
 
-  /**
-   * Native callback to notify the C++ wrapper of an ad closed event
-   */
+  /** Native callback to notify the C++ wrapper of an ad closed event */
   public static native void notifyAdClosed(long nativeInternalPtr);
 
-  /**
-   * Native callback to notify the C++ wrapper of an ad impression event
-   */
+  /** Native callback to notify the C++ wrapper of an ad impression event */
   public static native void notifyAdImpression(long nativeInternalPtr);
 
-  /**
-   * Native callback to notify the C++ wrapper of an ad opened event
-   */
+  /** Native callback to notify the C++ wrapper of an ad opened event */
   public static native void notifyAdOpened(long nativeInternalPtr);
 
-  /**
-   * Native callback to notify the C++ wrapper that a paid event has occurred.
-   */
+  /** Native callback to notify the C++ wrapper that a paid event has occurred. */
   public static native void notifyPaidEvent(
       long nativeInternalPtr, String currencyCode, int precisionType, long valueMicros);
 }
diff --git a/gma/src_java/com/google/firebase/gma/internal/cpp/ConstantsHelper.java b/gma/src_java/com/google/firebase/gma/internal/cpp/ConstantsHelper.java
index 2056275293..1abc0d4b1e 100644
--- a/gma/src_java/com/google/firebase/gma/internal/cpp/ConstantsHelper.java
+++ b/gma/src_java/com/google/firebase/gma/internal/cpp/ConstantsHelper.java
@@ -84,4 +84,6 @@ public final class ConstantsHelper {
   public static final int AD_VIEW_POSITION_BOTTOM_LEFT = 4;
 
   public static final int AD_VIEW_POSITION_BOTTOM_RIGHT = 5;
+
+  private ConstantsHelper() {}
 }
diff --git a/gma/src_java/com/google/firebase/gma/internal/cpp/GmaInitializationHelper.java b/gma/src_java/com/google/firebase/gma/internal/cpp/GmaInitializationHelper.java
index 85aee3c383..f1cab85410 100644
--- a/gma/src_java/com/google/firebase/gma/internal/cpp/GmaInitializationHelper.java
+++ b/gma/src_java/com/google/firebase/gma/internal/cpp/GmaInitializationHelper.java
@@ -34,4 +34,6 @@ public void onInitializationComplete(InitializationStatus initializationStatus)
 
   public static native void initializationCompleteCallback(
       InitializationStatus initializationStatus);
+
+  private GmaInitializationHelper() {}
 }
diff --git a/gma/src_java/com/google/firebase/gma/internal/cpp/InterstitialAdHelper.java b/gma/src_java/com/google/firebase/gma/internal/cpp/InterstitialAdHelper.java
index e08d82345a..c81ebc8dad 100644
--- a/gma/src_java/com/google/firebase/gma/internal/cpp/InterstitialAdHelper.java
+++ b/gma/src_java/com/google/firebase/gma/internal/cpp/InterstitialAdHelper.java
@@ -17,7 +17,6 @@
 package com.google.firebase.gma.internal.cpp;
 
 import android.app.Activity;
-import android.util.Log;
 import com.google.android.gms.ads.AdError;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.AdValue;
@@ -39,34 +38,32 @@ public class InterstitialAdHelper {
 
   // Pointer to the InterstitialAdInternalAndroid object that created this
   // object.
-  private long mInterstitialAdInternalPtr;
+  private long interstitialAdInternalPtr;
 
   // The GMA SDK {@link InterstitialAd} associated with this helper.
-  private InterstitialAd mInterstitial;
+  private InterstitialAd interstitial;
 
   // Synchronization object for thread safe access to:
-  // * mInterstitial
-  // * mInterstitialAdInternalPtr
-  // * mLoadAdCallbackDataPtr
-  private final Object mInterstitialLock;
+  // * interstitial
+  // * interstitialAdInternalPtr
+  // * loadAdCallbackDataPtr
+  private final Object interstitialLock;
 
   // The {@link Activity} this helper uses to display its
   // {@link InterstitialAd}.
-  private Activity mActivity;
+  private Activity activity;
 
   // The ad unit ID to use for the {@link InterstitialAd}.
-  private String mAdUnitId;
+  private String adUnitId;
 
   // Pointer to a FutureCallbackData in the C++ wrapper that will be used to
   // complete the Future associated with the latest call to LoadAd.
-  private long mLoadAdCallbackDataPtr;
+  private long loadAdCallbackDataPtr;
 
-  /**
-   * Constructor.
-   */
+  /** Constructor. */
   public InterstitialAdHelper(long interstitialAdInternalPtr) {
-    mInterstitialAdInternalPtr = interstitialAdInternalPtr;
-    mInterstitialLock = new Object();
+    this.interstitialAdInternalPtr = interstitialAdInternalPtr;
+    interstitialLock = new Object();
 
     // Test the callbacks and fail quickly if something's wrong.
     completeInterstitialAdFutureCallback(
@@ -78,19 +75,19 @@ public InterstitialAdHelper(long interstitialAdInternalPtr) {
    * InterstitialAd} object and sets it up.
    */
   public void initialize(final long callbackDataPtr, Activity activity) {
-    mActivity = activity;
+    this.activity = activity;
 
-    mActivity.runOnUiThread(new Runnable() {
+    this.activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
         int errorCode;
         String errorMessage;
-        if (mInterstitial == null) {
+        if (interstitial == null) {
           try {
             errorCode = ConstantsHelper.CALLBACK_ERROR_NONE;
             errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_NONE;
           } catch (IllegalStateException e) {
-            mInterstitial = null;
+            interstitial = null;
             // This exception can be thrown if the ad unit ID was already set.
             errorCode = ConstantsHelper.CALLBACK_ERROR_ALREADY_INITIALIZED;
             errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_ALREADY_INITIALIZED;
@@ -106,23 +103,23 @@ public void run() {
 
   /** Disconnect the helper from the interstital ad. */
   public void disconnect() {
-    synchronized (mInterstitialLock) {
-      mInterstitialAdInternalPtr = CPP_NULLPTR;
-      mLoadAdCallbackDataPtr = CPP_NULLPTR;
+    synchronized (interstitialLock) {
+      interstitialAdInternalPtr = CPP_NULLPTR;
+      loadAdCallbackDataPtr = CPP_NULLPTR;
     }
 
-    if (mActivity == null) {
+    if (activity == null) {
       return;
     }
 
-    mActivity.runOnUiThread(new Runnable() {
+    activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-        synchronized (mInterstitialLock) {
-          if (mInterstitial != null) {
-            mInterstitial.setFullScreenContentCallback(null);
-            mInterstitial.setOnPaidEventListener(null);
-            mInterstitial = null;
+        synchronized (interstitialLock) {
+          if (interstitial != null) {
+            interstitial.setFullScreenContentCallback(null);
+            interstitial.setOnPaidEventListener(null);
+            interstitial = null;
           }
         }
       }
@@ -131,40 +128,41 @@ public void run() {
 
   /** Loads an ad for the underlying {@link InterstitialAd} object. */
   public void loadAd(long callbackDataPtr, String adUnitId, final AdRequest request) {
-    if (mActivity == null) {
+    if (activity == null) {
       return;
     }
-    synchronized (mInterstitialLock) {
-      if (mLoadAdCallbackDataPtr != CPP_NULLPTR) {
+    synchronized (interstitialLock) {
+      if (loadAdCallbackDataPtr != CPP_NULLPTR) {
         completeInterstitialLoadAdInternalError(callbackDataPtr,
             ConstantsHelper.CALLBACK_ERROR_LOAD_IN_PROGRESS,
             ConstantsHelper.CALLBACK_ERROR_MESSAGE_LOAD_IN_PROGRESS);
         return;
       }
-      mLoadAdCallbackDataPtr = callbackDataPtr;
+      loadAdCallbackDataPtr = callbackDataPtr;
     }
 
-    mAdUnitId = adUnitId;
+    this.adUnitId = adUnitId;
 
-    mActivity.runOnUiThread(new Runnable() {
+    activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-        if (mActivity == null) {
-          synchronized (mInterstitialLock) {
-            completeInterstitialLoadAdInternalError(mLoadAdCallbackDataPtr,
+        if (activity == null) {
+          synchronized (interstitialLock) {
+            completeInterstitialLoadAdInternalError(loadAdCallbackDataPtr,
                 ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED,
                 ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED);
-            mLoadAdCallbackDataPtr = CPP_NULLPTR;
+            loadAdCallbackDataPtr = CPP_NULLPTR;
           }
         } else {
           try {
-            InterstitialAd.load(mActivity, mAdUnitId, request, new InterstitialAdListener());
+            InterstitialAd.load(activity, InterstitialAdHelper.this.adUnitId, request,
+                new InterstitialAdListener());
           } catch (IllegalStateException e) {
-            synchronized (mInterstitialLock) {
-              completeInterstitialLoadAdInternalError(mLoadAdCallbackDataPtr,
+            synchronized (interstitialLock) {
+              completeInterstitialLoadAdInternalError(loadAdCallbackDataPtr,
                   ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED,
                   ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED);
-              mLoadAdCallbackDataPtr = CPP_NULLPTR;
+              loadAdCallbackDataPtr = CPP_NULLPTR;
             }
           }
         }
@@ -174,22 +172,22 @@ public void run() {
 
   /** Shows a previously loaded ad. */
   public void show(final long callbackDataPtr) {
-    mActivity.runOnUiThread(new Runnable() {
+    activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-        synchronized (mInterstitialLock) {
+        synchronized (interstitialLock) {
           int errorCode;
           String errorMessage;
-          if (mAdUnitId == null) {
+          if (adUnitId == null) {
             errorCode = ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED;
             errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED;
-          } else if (mInterstitial == null) {
+          } else if (interstitial == null) {
             errorCode = ConstantsHelper.CALLBACK_ERROR_LOAD_IN_PROGRESS;
             errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_LOAD_IN_PROGRESS;
           } else {
             errorCode = ConstantsHelper.CALLBACK_ERROR_NONE;
             errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_NONE;
-            mInterstitial.show(mActivity);
+            interstitial.show(activity);
           }
           completeInterstitialAdFutureCallback(callbackDataPtr, errorCode, errorMessage);
         }
@@ -201,52 +199,53 @@ private class InterstitialAdFullScreenContentListener
       extends FullScreenContentCallback implements OnPaidEventListener {
     @Override
     public void onAdClicked() {
-      synchronized (mInterstitialLock) {
-        if (mInterstitialAdInternalPtr != CPP_NULLPTR) {
-          notifyAdClickedFullScreenContentEvent(mInterstitialAdInternalPtr);
+      synchronized (interstitialLock) {
+        if (interstitialAdInternalPtr != CPP_NULLPTR) {
+          notifyAdClickedFullScreenContentEvent(interstitialAdInternalPtr);
         }
       }
     }
 
     @Override
     public void onAdDismissedFullScreenContent() {
-      synchronized (mInterstitialLock) {
-        if (mInterstitialAdInternalPtr != CPP_NULLPTR) {
-          notifyAdDismissedFullScreenContentEvent(mInterstitialAdInternalPtr);
+      synchronized (interstitialLock) {
+        if (interstitialAdInternalPtr != CPP_NULLPTR) {
+          notifyAdDismissedFullScreenContentEvent(interstitialAdInternalPtr);
         }
       }
     }
 
     @Override
     public void onAdFailedToShowFullScreenContent(AdError error) {
-      synchronized (mInterstitialLock) {
-        if (mInterstitialAdInternalPtr != CPP_NULLPTR) {
-          notifyAdFailedToShowFullScreenContentEvent(mInterstitialAdInternalPtr, error);
+      synchronized (interstitialLock) {
+        if (interstitialAdInternalPtr != CPP_NULLPTR) {
+          notifyAdFailedToShowFullScreenContentEvent(interstitialAdInternalPtr, error);
         }
       }
     }
 
     @Override
     public void onAdImpression() {
-      synchronized (mInterstitialLock) {
-        if (mInterstitialAdInternalPtr != CPP_NULLPTR) {
-          notifyAdImpressionEvent(mInterstitialAdInternalPtr);
+      synchronized (interstitialLock) {
+        if (interstitialAdInternalPtr != CPP_NULLPTR) {
+          notifyAdImpressionEvent(interstitialAdInternalPtr);
         }
       }
     }
 
     @Override
     public void onAdShowedFullScreenContent() {
-      synchronized (mInterstitialLock) {
-        if (mInterstitialAdInternalPtr != CPP_NULLPTR) {
-          notifyAdShowedFullScreenContentEvent(mInterstitialAdInternalPtr);
+      synchronized (interstitialLock) {
+        if (interstitialAdInternalPtr != CPP_NULLPTR) {
+          notifyAdShowedFullScreenContentEvent(interstitialAdInternalPtr);
         }
       }
     }
 
+    @Override
     public void onPaidEvent(AdValue value) {
-      synchronized (mInterstitialLock) {
-        notifyPaidEvent(mInterstitialAdInternalPtr, value.getCurrencyCode(),
+      synchronized (interstitialLock) {
+        notifyPaidEvent(interstitialAdInternalPtr, value.getCurrencyCode(),
             value.getPrecisionType(), value.getValueMicros());
       }
     }
@@ -255,26 +254,26 @@ public void onPaidEvent(AdValue value) {
   private class InterstitialAdListener extends InterstitialAdLoadCallback {
     @Override
     public void onAdFailedToLoad(LoadAdError loadAdError) {
-      synchronized (mInterstitialLock) {
-        if (mLoadAdCallbackDataPtr != CPP_NULLPTR) {
+      synchronized (interstitialLock) {
+        if (loadAdCallbackDataPtr != CPP_NULLPTR) {
           completeInterstitialLoadAdError(
-              mLoadAdCallbackDataPtr, loadAdError, loadAdError.getCode(), loadAdError.getMessage());
-          mLoadAdCallbackDataPtr = CPP_NULLPTR;
+              loadAdCallbackDataPtr, loadAdError, loadAdError.getCode(), loadAdError.getMessage());
+          loadAdCallbackDataPtr = CPP_NULLPTR;
         }
       }
     }
 
     @Override
     public void onAdLoaded(InterstitialAd ad) {
-      synchronized (mInterstitialLock) {
-        mInterstitial = ad;
+      synchronized (interstitialLock) {
+        interstitial = ad;
         InterstitialAdFullScreenContentListener listener =
             new InterstitialAdFullScreenContentListener();
-        mInterstitial.setFullScreenContentCallback(listener);
-        mInterstitial.setOnPaidEventListener(listener);
-        if (mLoadAdCallbackDataPtr != CPP_NULLPTR) {
-          completeInterstitialLoadedAd(mLoadAdCallbackDataPtr, ad.getResponseInfo());
-          mLoadAdCallbackDataPtr = CPP_NULLPTR;
+        interstitial.setFullScreenContentCallback(listener);
+        interstitial.setOnPaidEventListener(listener);
+        if (loadAdCallbackDataPtr != CPP_NULLPTR) {
+          completeInterstitialLoadedAd(loadAdCallbackDataPtr, ad.getResponseInfo());
+          loadAdCallbackDataPtr = CPP_NULLPTR;
         }
       }
     }
diff --git a/gma/src_java/com/google/firebase/gma/internal/cpp/RewardedAdHelper.java b/gma/src_java/com/google/firebase/gma/internal/cpp/RewardedAdHelper.java
index 3e78901d2f..038c2d5cfb 100644
--- a/gma/src_java/com/google/firebase/gma/internal/cpp/RewardedAdHelper.java
+++ b/gma/src_java/com/google/firebase/gma/internal/cpp/RewardedAdHelper.java
@@ -17,7 +17,6 @@
 package com.google.firebase.gma.internal.cpp;
 
 import android.app.Activity;
-import android.util.Log;
 import com.google.android.gms.ads.AdError;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.AdValue;
@@ -42,32 +41,32 @@ public class RewardedAdHelper {
 
   // Pointer to the RewardedAdInternalAndroid object that created this
   // object.
-  private long mRewardedAdInternalPtr;
+  private long rewardedAdInternalPtr;
 
   // The GMA SDK {@link RewardedAd} associated with this helper.
-  private RewardedAd mRewarded;
+  private RewardedAd rewarded;
 
   // Synchronization object for thread safe access to:
-  // * mRewarded
-  // * mRewardedAdInternalPtr
-  // * mLoadAdCallbackDataPtr
-  private final Object mRewardedLock;
+  // * rewarded
+  // * rewardedAdInternalPtr
+  // * loadAdCallbackDataPtr
+  private final Object rewardedLock;
 
   // The {@link Activity} this helper uses to display its
   // {@link RewardedAd}.
-  private Activity mActivity;
+  private Activity activity;
 
   // The ad unit ID to use for the {@link RewardedAd}.
-  private String mAdUnitId;
+  private String adUnitId;
 
   // Pointer to a FutureCallbackData in the C++ wrapper that will be used to
   // complete the Future associated with the latest call to LoadAd.
-  private long mLoadAdCallbackDataPtr;
+  private long loadAdCallbackDataPtr;
 
   /** Constructor. */
   public RewardedAdHelper(long rewardedAdInternalPtr) {
-    mRewardedAdInternalPtr = rewardedAdInternalPtr;
-    mRewardedLock = new Object();
+    this.rewardedAdInternalPtr = rewardedAdInternalPtr;
+    rewardedLock = new Object();
 
     // Test the callbacks and fail quickly if something's wrong.
     completeRewardedAdFutureCallback(CPP_NULLPTR, 0, ConstantsHelper.CALLBACK_ERROR_MESSAGE_NONE);
@@ -78,20 +77,20 @@ public RewardedAdHelper(long rewardedAdInternalPtr) {
    * object and sets it up.
    */
   public void initialize(final long callbackDataPtr, Activity activity) {
-    mActivity = activity;
+    this.activity = activity;
 
-    mActivity.runOnUiThread(new Runnable() {
+    this.activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
         int errorCode;
         String errorMessage;
-        synchronized (mRewardedLock) {
-          if (mRewarded == null) {
+        synchronized (rewardedLock) {
+          if (rewarded == null) {
             try {
               errorCode = ConstantsHelper.CALLBACK_ERROR_NONE;
               errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_NONE;
             } catch (IllegalStateException e) {
-              mRewarded = null;
+              rewarded = null;
               // This exception can be thrown if the ad unit ID was already set.
               errorCode = ConstantsHelper.CALLBACK_ERROR_ALREADY_INITIALIZED;
               errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_ALREADY_INITIALIZED;
@@ -108,23 +107,23 @@ public void run() {
 
   /** Disconnect the helper from the interstital ad. */
   public void disconnect() {
-    synchronized (mRewardedLock) {
-      mRewardedAdInternalPtr = CPP_NULLPTR;
-      mLoadAdCallbackDataPtr = CPP_NULLPTR;
+    synchronized (rewardedLock) {
+      rewardedAdInternalPtr = CPP_NULLPTR;
+      loadAdCallbackDataPtr = CPP_NULLPTR;
     }
 
-    if (mActivity == null) {
+    if (activity == null) {
       return;
     }
 
-    mActivity.runOnUiThread(new Runnable() {
+    activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-        synchronized (mRewardedLock) {
-          if (mRewarded != null) {
-            mRewarded.setFullScreenContentCallback(null);
-            mRewarded.setOnPaidEventListener(null);
-            mRewarded = null;
+        synchronized (rewardedLock) {
+          if (rewarded != null) {
+            rewarded.setFullScreenContentCallback(null);
+            rewarded.setOnPaidEventListener(null);
+            rewarded = null;
           }
         }
       }
@@ -133,38 +132,39 @@ public void run() {
 
   /** Loads an ad for the underlying {@link RewardedAd} object. */
   public void loadAd(long callbackDataPtr, String adUnitId, final AdRequest request) {
-    if (mActivity == null) {
+    if (activity == null) {
       return;
     }
-    synchronized (mRewardedLock) {
-      if (mLoadAdCallbackDataPtr != CPP_NULLPTR) {
+    synchronized (rewardedLock) {
+      if (loadAdCallbackDataPtr != CPP_NULLPTR) {
         completeRewardedLoadAdInternalError(callbackDataPtr,
             ConstantsHelper.CALLBACK_ERROR_LOAD_IN_PROGRESS,
             ConstantsHelper.CALLBACK_ERROR_MESSAGE_LOAD_IN_PROGRESS);
         return;
       }
-      mLoadAdCallbackDataPtr = callbackDataPtr;
+      loadAdCallbackDataPtr = callbackDataPtr;
     }
 
-    mAdUnitId = adUnitId;
+    this.adUnitId = adUnitId;
 
-    mActivity.runOnUiThread(new Runnable() {
+    activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-        synchronized (mRewardedLock) {
-          if (mActivity == null) {
-            completeRewardedLoadAdInternalError(mLoadAdCallbackDataPtr,
+        synchronized (rewardedLock) {
+          if (activity == null) {
+            completeRewardedLoadAdInternalError(loadAdCallbackDataPtr,
                 ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED,
                 ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED);
-            mLoadAdCallbackDataPtr = CPP_NULLPTR;
+            loadAdCallbackDataPtr = CPP_NULLPTR;
           } else {
             try {
-              RewardedAd.load(mActivity, mAdUnitId, request, new RewardedAdListener());
+              RewardedAd.load(
+                  activity, RewardedAdHelper.this.adUnitId, request, new RewardedAdListener());
             } catch (IllegalStateException e) {
-              completeRewardedLoadAdInternalError(mLoadAdCallbackDataPtr,
+              completeRewardedLoadAdInternalError(loadAdCallbackDataPtr,
                   ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED,
                   ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED);
-              mLoadAdCallbackDataPtr = CPP_NULLPTR;
+              loadAdCallbackDataPtr = CPP_NULLPTR;
             }
           }
         }
@@ -172,21 +172,19 @@ public void run() {
     });
   }
 
-  /**
-   * Shows a previously loaded ad.
-   */
+  /** Shows a previously loaded ad. */
   public void show(final long callbackDataPtr, final String verificationCustomData,
       final String verificationUserId) {
-    mActivity.runOnUiThread(new Runnable() {
+    activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-        synchronized (mRewardedLock) {
+        synchronized (rewardedLock) {
           int errorCode;
           String errorMessage;
-          if (mAdUnitId == null) {
+          if (adUnitId == null) {
             errorCode = ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED;
             errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED;
-          } else if (mRewarded == null) {
+          } else if (rewarded == null) {
             errorCode = ConstantsHelper.CALLBACK_ERROR_LOAD_IN_PROGRESS;
             errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_LOAD_IN_PROGRESS;
           } else {
@@ -197,9 +195,9 @@ public void run() {
                                                           .setCustomData(verificationCustomData)
                                                           .setUserId(verificationUserId)
                                                           .build();
-              mRewarded.setServerSideVerificationOptions(options);
+              rewarded.setServerSideVerificationOptions(options);
             }
-            mRewarded.show(mActivity, new UserEarnedRewardListener());
+            rewarded.show(activity, new UserEarnedRewardListener());
           }
           completeRewardedAdFutureCallback(callbackDataPtr, errorCode, errorMessage);
         }
@@ -210,10 +208,10 @@ public void run() {
   private class UserEarnedRewardListener implements OnUserEarnedRewardListener {
     @Override
     public void onUserEarnedReward(RewardItem rewardItem) {
-      synchronized (mRewardedLock) {
-        if (mRewardedAdInternalPtr != CPP_NULLPTR) {
+      synchronized (rewardedLock) {
+        if (rewardedAdInternalPtr != CPP_NULLPTR) {
           notifyUserEarnedRewardEvent(
-              mRewardedAdInternalPtr, rewardItem.getType(), rewardItem.getAmount());
+              rewardedAdInternalPtr, rewardItem.getType(), rewardItem.getAmount());
         }
       }
     }
@@ -223,53 +221,54 @@ private class RewardedAdFullScreenContentListener
       extends FullScreenContentCallback implements OnPaidEventListener {
     @Override
     public void onAdClicked() {
-      synchronized (mRewardedLock) {
-        if (mRewardedAdInternalPtr != CPP_NULLPTR) {
-          notifyAdClickedFullScreenContentEvent(mRewardedAdInternalPtr);
+      synchronized (rewardedLock) {
+        if (rewardedAdInternalPtr != CPP_NULLPTR) {
+          notifyAdClickedFullScreenContentEvent(rewardedAdInternalPtr);
         }
       }
     }
 
     @Override
     public void onAdDismissedFullScreenContent() {
-      synchronized (mRewardedLock) {
-        if (mRewardedAdInternalPtr != CPP_NULLPTR) {
-          notifyAdDismissedFullScreenContentEvent(mRewardedAdInternalPtr);
+      synchronized (rewardedLock) {
+        if (rewardedAdInternalPtr != CPP_NULLPTR) {
+          notifyAdDismissedFullScreenContentEvent(rewardedAdInternalPtr);
         }
       }
     }
 
     @Override
     public void onAdFailedToShowFullScreenContent(AdError error) {
-      synchronized (mRewardedLock) {
-        if (mRewardedAdInternalPtr != CPP_NULLPTR) {
-          notifyAdFailedToShowFullScreenContentEvent(mRewardedAdInternalPtr, error);
+      synchronized (rewardedLock) {
+        if (rewardedAdInternalPtr != CPP_NULLPTR) {
+          notifyAdFailedToShowFullScreenContentEvent(rewardedAdInternalPtr, error);
         }
       }
     }
 
     @Override
     public void onAdImpression() {
-      synchronized (mRewardedLock) {
-        if (mRewardedAdInternalPtr != CPP_NULLPTR) {
-          notifyAdImpressionEvent(mRewardedAdInternalPtr);
+      synchronized (rewardedLock) {
+        if (rewardedAdInternalPtr != CPP_NULLPTR) {
+          notifyAdImpressionEvent(rewardedAdInternalPtr);
         }
       }
     }
 
     @Override
     public void onAdShowedFullScreenContent() {
-      synchronized (mRewardedLock) {
-        if (mRewardedAdInternalPtr != CPP_NULLPTR) {
-          notifyAdShowedFullScreenContentEvent(mRewardedAdInternalPtr);
+      synchronized (rewardedLock) {
+        if (rewardedAdInternalPtr != CPP_NULLPTR) {
+          notifyAdShowedFullScreenContentEvent(rewardedAdInternalPtr);
         }
       }
     }
 
+    @Override
     public void onPaidEvent(AdValue value) {
-      synchronized (mRewardedLock) {
-        if (mRewardedAdInternalPtr != CPP_NULLPTR) {
-          notifyPaidEvent(mRewardedAdInternalPtr, value.getCurrencyCode(), value.getPrecisionType(),
+      synchronized (rewardedLock) {
+        if (rewardedAdInternalPtr != CPP_NULLPTR) {
+          notifyPaidEvent(rewardedAdInternalPtr, value.getCurrencyCode(), value.getPrecisionType(),
               value.getValueMicros());
         }
       }
@@ -279,25 +278,25 @@ public void onPaidEvent(AdValue value) {
   private class RewardedAdListener extends RewardedAdLoadCallback {
     @Override
     public void onAdFailedToLoad(LoadAdError loadAdError) {
-      synchronized (mRewardedLock) {
-        if (mLoadAdCallbackDataPtr != CPP_NULLPTR) {
+      synchronized (rewardedLock) {
+        if (loadAdCallbackDataPtr != CPP_NULLPTR) {
           completeRewardedLoadAdError(
-              mLoadAdCallbackDataPtr, loadAdError, loadAdError.getCode(), loadAdError.getMessage());
-          mLoadAdCallbackDataPtr = CPP_NULLPTR;
+              loadAdCallbackDataPtr, loadAdError, loadAdError.getCode(), loadAdError.getMessage());
+          loadAdCallbackDataPtr = CPP_NULLPTR;
         }
       }
     }
 
     @Override
     public void onAdLoaded(RewardedAd ad) {
-      synchronized (mRewardedLock) {
-        if (mLoadAdCallbackDataPtr != CPP_NULLPTR) {
-          mRewarded = ad;
+      synchronized (rewardedLock) {
+        if (loadAdCallbackDataPtr != CPP_NULLPTR) {
+          rewarded = ad;
           RewardedAdFullScreenContentListener listener = new RewardedAdFullScreenContentListener();
-          mRewarded.setFullScreenContentCallback(listener);
-          mRewarded.setOnPaidEventListener(listener);
-          completeRewardedLoadedAd(mLoadAdCallbackDataPtr, mRewarded.getResponseInfo());
-          mLoadAdCallbackDataPtr = CPP_NULLPTR;
+          rewarded.setFullScreenContentCallback(listener);
+          rewarded.setOnPaidEventListener(listener);
+          completeRewardedLoadedAd(loadAdCallbackDataPtr, rewarded.getResponseInfo());
+          loadAdCallbackDataPtr = CPP_NULLPTR;
         }
       }
     }