diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md
index 01d7b1ab5bf..2b0e40f21e5 100644
--- a/platform/android/CHANGELOG.md
+++ b/platform/android/CHANGELOG.md
@@ -6,6 +6,7 @@ Mapbox welcomes participation and contributions from everyone.  If you'd like to
 
 5.0.2 is a patch release that contains the following changes:
 
+* Binary shader caching [#8604](https://github.com/mapbox/mapbox-gl-native/pull/8604)
 * Fix resource transform callback [#8582](https://github.com/mapbox/mapbox-gl-native/pull/8582)
 * Restore onTouch behaviour to 4.x version [#8585](https://github.com/mapbox/mapbox-gl-native/pull/8585)
 * Restore anchoring after updating MarkerView Icon [#8519](https://github.com/mapbox/mapbox-gl-native/pull/8519)
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
index 74170bb72bd..a8fc58d51c0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
@@ -293,7 +293,7 @@ public Builder target(LatLng location) {
      * Set the tilt in degrees
      * <p>
      * value is clamped to 0 and 60.
-     * <p/>
+     * </p>
      *
      * @param tilt Tilt value
      * @return Builder
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
index f41a022fa2a..dd6e43d06a8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
@@ -18,11 +18,10 @@
 /**
  * Manages locational updates. Contains methods to register and unregister location listeners.
  * <ul>
- * <li>You can register a {@link LocationEngineListener} with
- * {@link #addLocationEngineListener(LocationEngineListener)} to receive
- * location updates.</li>
- * <li> You can unregister a {@link LocationEngineListener} with
- * {@link #removeLocationEngineListener(LocationEngineListener)} to stop receiving location updates.</li>
+ * <li>You can register a LocationEngineListener with LocationSource#addLocationEngineListener(LocationEngineListener)
+ * to receive location updates.</li>
+ * <li> You can unregister a LocationEngineListener with
+ * LocationEngine#removeLocationEngineListener(LocationEngineListener)} to stop receiving location updates.</li>
  * </ul>
  * <p>
  * Note: If registering a listener in your Activity.onStart() implementation, you should unregister it in
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
index b2535957131..5e9ca7d0a8c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
@@ -42,7 +42,7 @@ public GeoJsonSource(String id) {
   }
 
   /**
-   * Create an empty GeoJsonSource with non-default {@link GeoJsonOptions}
+   * Create an empty GeoJsonSource with non-default GeoJsonOptions.
    *
    * @param id      the source id
    * @param options options
@@ -67,7 +67,7 @@ public GeoJsonSource(String id, String geoJson) {
   }
 
   /**
-   * Create a GeoJsonSource from a raw json string and non-default {@link GeoJsonOptions}
+   * Create a GeoJsonSource from a raw json string and non-default GeoJsonOptions
    *
    * @param id      the source id
    * @param geoJson raw Json body
@@ -93,7 +93,7 @@ public GeoJsonSource(String id, URL url) {
   }
 
   /**
-   * Create a GeoJsonSource from a remote geo json file and non-default {@link GeoJsonOptions}
+   * Create a GeoJsonSource from a remote geo json file and non-default GeoJsonOptions
    *
    * @param id      the source id
    * @param url     remote json file
@@ -105,7 +105,7 @@ public GeoJsonSource(String id, URL url, GeoJsonOptions options) {
   }
 
   /**
-   * Create a GeoJsonSource from a {@link FeatureCollection}
+   * Create a GeoJsonSource from a FeatureCollection.
    *
    * @param id       the source id
    * @param features the features
@@ -116,7 +116,7 @@ public GeoJsonSource(String id, FeatureCollection features) {
   }
 
   /**
-   * Create a GeoJsonSource from a {@link FeatureCollection} and non-default {@link GeoJsonOptions}
+   * Create a GeoJsonSource from a FeatureCollection and non-default GeoJsonOptions.
    *
    * @param id       the source id
    * @param features the features
@@ -130,7 +130,7 @@ public GeoJsonSource(String id, FeatureCollection features, GeoJsonOptions optio
   /**
    * Updates the GeoJson
    *
-   * @param features the GeoJSON {@link FeatureCollection}
+   * @param features the GeoJSON FeatureCollection
    */
   public void setGeoJson(FeatureCollection features) {
     checkValidity();