diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md
index e6f2ff00d02f..3c569ed01a79 100644
--- a/packages/google_maps_flutter/CHANGELOG.md
+++ b/packages/google_maps_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.21+3
+
+* Fix `myLocationButton` bug in `google_maps_flutter` iOS.
+
 ## 0.5.21+2
 
 * Fix more `prefer_const_constructors` analyzer warnings in example app.
diff --git a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
index 600820e0cc0c..04a9f415e6fc 100644
--- a/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
+++ b/packages/google_maps_flutter/ios/Classes/GoogleMapController.m
@@ -327,7 +327,6 @@ - (void)setZoomGesturesEnabled:(BOOL)enabled {
 
 - (void)setMyLocationEnabled:(BOOL)enabled {
   _mapView.myLocationEnabled = enabled;
-  _mapView.settings.myLocationButton = enabled;
 }
 
 - (void)setMyLocationButtonEnabled:(BOOL)enabled {
diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml
index 7de1fd6bca7d..bdc41c873909 100644
--- a/packages/google_maps_flutter/pubspec.yaml
+++ b/packages/google_maps_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.21+2
+version: 0.5.21+3
 
 dependencies:
   flutter:
diff --git a/packages/instrumentation_adapter/CHANGELOG.md b/packages/instrumentation_adapter/CHANGELOG.md
index f4cd692a1916..9a07ba0c1cbf 100644
--- a/packages/instrumentation_adapter/CHANGELOG.md
+++ b/packages/instrumentation_adapter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.4
+
+* Migrate example to AndroidX.
+
 ## 0.1.3
 
 * Added example app.
diff --git a/packages/instrumentation_adapter/example/android/gradle.properties b/packages/instrumentation_adapter/example/android/gradle.properties
index 2bd6f4fda009..755300e3a0b5 100644
--- a/packages/instrumentation_adapter/example/android/gradle.properties
+++ b/packages/instrumentation_adapter/example/android/gradle.properties
@@ -1,2 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/packages/instrumentation_adapter/pubspec.yaml b/packages/instrumentation_adapter/pubspec.yaml
index 1ac0aed7b05e..1d8c258d8097 100644
--- a/packages/instrumentation_adapter/pubspec.yaml
+++ b/packages/instrumentation_adapter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: instrumentation_adapter
 description: Runs tests that use the flutter_test API as integration tests.
-version: 0.1.3
+version: 0.1.4
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/instrumentation_adapter