diff --git a/ApiDemos/java/app/src/v3/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java b/ApiDemos/java/app/src/v3/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java
index cc9717ab..d840430f 100644
--- a/ApiDemos/java/app/src/v3/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java
+++ b/ApiDemos/java/app/src/v3/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java
@@ -9,7 +9,7 @@ import com.google.android.libraries.maps.SupportMapFragment;
 /**
  * This shows how to use Cloud-based Map Styling in a simple Activity. For more information on how
  * to style a map using this method, see:
- * https://developers.google.com/maps/documentation/android-sdk/cloud-styling-android
+ * https://developers.google.com/maps/documentation/android-sdk/cloud-based-map-styling
  **/
 public class CloudBasedMapStylingDemoActivity extends AppCompatActivity implements OnMapReadyCallback {
 
diff --git a/ApiDemos/java/app/src/v3/res/layout/polyline_pattern_control_fragment.xml b/ApiDemos/java/app/src/v3/res/layout/polyline_pattern_control_fragment.xml
index a9e8bfed..304bf705 100644
--- a/ApiDemos/java/app/src/v3/res/layout/polyline_pattern_control_fragment.xml
+++ b/ApiDemos/java/app/src/v3/res/layout/polyline_pattern_control_fragment.xml
@@ -32,25 +32,21 @@
                 android:id="@+id/patternSolidBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="setPatternSolid"
                 android:text="@string/pattern_solid" />
             <Button
                 android:id="@+id/patternDottedBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="setPatternDotted"
                 android:text="@string/pattern_dotted" />
             <Button
                 android:id="@+id/patternDashedBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="setPatternDashed"
                 android:text="@string/pattern_dashed" />
             <Button
                 android:id="@+id/patternMixedBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="setPatternMixed"
                 android:text="@string/pattern_mixed" />
         </LinearLayout>
         <TextView
diff --git a/ApiDemos/kotlin/app/src/v3/java/com/example/kotlindemos/CloudBasedMapStylingDemoActivity.kt b/ApiDemos/kotlin/app/src/v3/java/com/example/kotlindemos/CloudBasedMapStylingDemoActivity.kt
index d9a885d8..074c2bdc 100644
--- a/ApiDemos/kotlin/app/src/v3/java/com/example/kotlindemos/CloudBasedMapStylingDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/v3/java/com/example/kotlindemos/CloudBasedMapStylingDemoActivity.kt
@@ -32,7 +32,7 @@ import com.google.android.libraries.maps.SupportMapFragment
 /**
  * This shows how to use Cloud-based Map Styling in a simple Activity. For more information on how
  * to style a map using this method, see:
- * https://developers.google.com/maps/documentation/android-sdk/cloud-styling-android
+ * https://developers.google.com/maps/documentation/android-sdk/cloud-based-map-styling
  */
 class CloudBasedMapStylingDemoActivity : AppCompatActivity(), OnMapReadyCallback {
     private var map: GoogleMap? = null
diff --git a/ApiDemos/kotlin/app/src/v3/res/layout/polyline_pattern_control_fragment.xml b/ApiDemos/kotlin/app/src/v3/res/layout/polyline_pattern_control_fragment.xml
index a9e8bfed..304bf705 100644
--- a/ApiDemos/kotlin/app/src/v3/res/layout/polyline_pattern_control_fragment.xml
+++ b/ApiDemos/kotlin/app/src/v3/res/layout/polyline_pattern_control_fragment.xml
@@ -32,25 +32,21 @@
                 android:id="@+id/patternSolidBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="setPatternSolid"
                 android:text="@string/pattern_solid" />
             <Button
                 android:id="@+id/patternDottedBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="setPatternDotted"
                 android:text="@string/pattern_dotted" />
             <Button
                 android:id="@+id/patternDashedBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="setPatternDashed"
                 android:text="@string/pattern_dashed" />
             <Button
                 android:id="@+id/patternMixedBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="setPatternMixed"
                 android:text="@string/pattern_mixed" />
         </LinearLayout>
         <TextView