diff --git a/demo-kotlin/app/build.gradle b/demo-kotlin/app/build.gradle
index d7833934..fd697950 100644
--- a/demo-kotlin/app/build.gradle
+++ b/demo-kotlin/app/build.gradle
@@ -38,6 +38,7 @@ dependencies {
 
     // Places SDK for Android
     implementation 'com.google.android.libraries.places:places:3.0.0'
+    implementation 'com.google.maps.android:android-maps-utils:2.4.0'
 }
 repositories {
     mavenCentral()
diff --git a/demo-kotlin/app/src/main/AndroidManifest.xml b/demo-kotlin/app/src/main/AndroidManifest.xml
index 4e08eb4c..6066bb42 100644
--- a/demo-kotlin/app/src/main/AndroidManifest.xml
+++ b/demo-kotlin/app/src/main/AndroidManifest.xml
@@ -28,6 +28,14 @@
     android:supportsRtl="true"
     android:theme="@style/Theme.AppCompat.Light">
 
+    <meta-data
+        android:name="com.google.android.gms.version"
+        android:value="@integer/google_play_services_version" />
+
+    <meta-data
+        android:name="com.google.android.geo.API_KEY"
+        android:value="${MAPS_API_KEY}" />
+
     <activity android:name=".MainActivity"
         android:exported="true">
       <intent-filter>
@@ -38,6 +46,7 @@
     </activity>
 
     <activity android:name=".PlaceAutocompleteActivity" />
+    <activity android:name=".AutocompleteAddressActivity" />
     <activity android:name=".PlaceDetailsAndPhotosActivity" />
     <activity android:name=".CurrentPlaceActivity" />
     <activity
diff --git a/demo-kotlin/app/src/main/java/com/example/placesdemo/AutocompleteAddressActivity.kt b/demo-kotlin/app/src/main/java/com/example/placesdemo/AutocompleteAddressActivity.kt
new file mode 100644
index 00000000..41f5c64d
--- /dev/null
+++ b/demo-kotlin/app/src/main/java/com/example/placesdemo/AutocompleteAddressActivity.kt
@@ -0,0 +1,339 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.example.placesdemo
+
+import android.Manifest.permission
+import android.annotation.SuppressLint
+import android.content.pm.PackageManager
+import android.content.res.Resources.NotFoundException
+import android.location.Location
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import android.view.ViewStub
+import android.widget.Button
+import android.widget.CheckBox
+import android.widget.CompoundButton
+import android.widget.Toast
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultCallback
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import com.example.placesdemo.databinding.AutocompleteAddressActivityBinding
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.maps.*
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.MapStyleOptions
+import com.google.android.gms.maps.model.Marker
+import com.google.android.gms.maps.model.MarkerOptions
+import com.google.android.libraries.places.api.model.Place
+import com.google.android.libraries.places.api.model.TypeFilter
+import com.google.android.libraries.places.widget.Autocomplete
+import com.google.android.libraries.places.widget.model.AutocompleteActivityMode
+import com.google.maps.android.SphericalUtil.computeDistanceBetween
+import java.util.*
+
+/**
+ *  Activity for using Place Autocomplete to assist filling out an address form.
+ */
+class AutocompleteAddressActivity : AppCompatActivity(R.layout.autocomplete_address_activity),
+    OnMapReadyCallback {
+    private lateinit var mapPanel: View
+
+    private var mapFragment: SupportMapFragment? = null
+    private lateinit var coordinates: LatLng
+    private var map: GoogleMap? = null
+    private var marker: Marker? = null
+    private var checkProximity = false
+    private lateinit var binding: AutocompleteAddressActivityBinding
+    private var deviceLocation: LatLng? = null
+    private val acceptedProximity = 150.0
+    private var startAutocompleteIntentListener = View.OnClickListener { view: View ->
+        view.setOnClickListener(null)
+        startAutocompleteIntent()
+    }
+
+    // [START maps_solutions_android_autocomplete_define]
+    private val startAutocomplete = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult(),
+        ActivityResultCallback { result: ActivityResult ->
+            binding.autocompleteAddress1.setOnClickListener(startAutocompleteIntentListener)
+            if (result.resultCode == RESULT_OK) {
+                val intent = result.data
+                if (intent != null) {
+                    val place = Autocomplete.getPlaceFromIntent(intent)
+
+                    // Write a method to read the address components from the Place
+                    // and populate the form with the address components
+                    Log.d(TAG, "Place: " + place.addressComponents)
+                    fillInAddress(place)
+                }
+            } else if (result.resultCode == RESULT_CANCELED) {
+                // The user canceled the operation.
+                Log.i(TAG, "User canceled autocomplete")
+            }
+        } as ActivityResultCallback<ActivityResult>)
+    // [END maps_solutions_android_autocomplete_define]
+
+    // [START maps_solutions_android_autocomplete_intent]
+    private fun startAutocompleteIntent() {
+        // Set the fields to specify which types of place data to
+        // return after the user has made a selection.
+        val fields = listOf(
+            Place.Field.ADDRESS_COMPONENTS,
+            Place.Field.LAT_LNG, Place.Field.VIEWPORT
+        )
+
+        // Build the autocomplete intent with field, country, and type filters applied
+        val intent = Autocomplete.IntentBuilder(AutocompleteActivityMode.OVERLAY, fields)
+            .setCountry("US")
+            //TODO: https://developers.google.com/maps/documentation/places/android-sdk/autocomplete
+            .setTypesFilter(listOf(TypeFilter.ADDRESS.toString().lowercase()))
+            .build(this)
+        startAutocomplete.launch(intent)
+    }
+    // [END maps_solutions_android_autocomplete_intent]
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = AutocompleteAddressActivityBinding.inflate(layoutInflater)
+        val view = binding.root
+        setContentView(view)
+
+        // Attach an Autocomplete intent to the Address 1 EditText field
+        binding.autocompleteAddress1.setOnClickListener(startAutocompleteIntentListener)
+
+        // Update checkProximity when user checks the checkbox
+        val checkProximityBox = findViewById<CheckBox>(R.id.checkbox_proximity)
+        checkProximityBox.setOnCheckedChangeListener { _: CompoundButton?, isChecked: Boolean ->
+            // Set the boolean to match user preference for when the Submit button is clicked
+            checkProximity = isChecked
+        }
+
+        // Submit and optionally check proximity
+        val saveButton = findViewById<Button>(R.id.autocomplete_save_button)
+        saveButton.setOnClickListener { saveForm() }
+
+        // Reset the form
+        val resetButton = findViewById<Button>(R.id.autocomplete_reset_button)
+        resetButton.setOnClickListener { clearForm() }
+    }
+
+    private fun saveForm() {
+        Log.d(TAG, "checkProximity = $checkProximity")
+        if (checkProximity) {
+            checkLocationPermissions()
+        } else {
+            Toast.makeText(this, R.string.autocomplete_skipped_message, Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    // [START maps_solutions_android_location_permissions]
+    private fun checkLocationPermissions() {
+        if (ContextCompat.checkSelfPermission(this, permission.ACCESS_FINE_LOCATION)
+            == PackageManager.PERMISSION_GRANTED
+        ) {
+            getAndCompareLocations()
+        } else {
+            requestPermissionLauncher.launch(
+                permission.ACCESS_FINE_LOCATION
+            )
+        }
+    }
+    // [END maps_solutions_android_location_permissions]
+
+    @SuppressLint("MissingPermission")
+    private fun getAndCompareLocations() {
+        // TODO: Detect and handle if user has entered or modified the address manually and update
+        // the coordinates variable to the Lat/Lng of the manually entered address. May use
+        // Geocoding API to convert the manually entered address to a Lat/Lng.
+        val enteredLocation = coordinates
+        map!!.isMyLocationEnabled = true
+
+        // [START maps_solutions_android_location_get]
+        val fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
+        fusedLocationClient.lastLocation
+            .addOnSuccessListener(this) { location: Location? ->
+                // Got last known location. In some rare situations this can be null.
+                if (location == null) {
+                    return@addOnSuccessListener
+                }
+                deviceLocation = LatLng(location.latitude, location.longitude)
+                // [START_EXCLUDE]
+                Log.d(TAG, "device location = " + deviceLocation.toString())
+                Log.d(TAG, "entered location = $enteredLocation")
+
+                // [START maps_solutions_android_location_distance]
+                // Use the computeDistanceBetween function in the Maps SDK for Android Utility Library
+                // to use spherical geometry to compute the distance between two Lat/Lng points.
+                val distanceInMeters: Double =
+                    computeDistanceBetween(deviceLocation, enteredLocation)
+                if (distanceInMeters <= acceptedProximity) {
+                    Log.d(TAG, "location matched")
+                    // TODO: Display UI based on the locations matching
+                } else {
+                    Log.d(TAG, "location not matched")
+                    // TODO: Display UI based on the locations not matching
+                }
+                // [END maps_solutions_android_location_distance]
+                // [END_EXCLUDE]
+            }
+    }
+    // [END maps_solutions_android_location_get]
+
+    private fun fillInAddress(place: Place) {
+        val components = place.addressComponents
+        val address1 = StringBuilder()
+        val postcode = StringBuilder()
+
+        // Get each component of the address from the place details,
+        // and then fill-in the corresponding field on the form.
+        // Possible AddressComponent types are documented at https://goo.gle/32SJPM1
+        if (components != null) {
+            for (component in components.asList()) {
+                when (component.types[0]) {
+                    "street_number" -> {
+                        address1.insert(0, component.name)
+                    }
+                    "route" -> {
+                        address1.append(" ")
+                        address1.append(component.shortName)
+                    }
+                    "postal_code" -> {
+                        postcode.insert(0, component.name)
+                    }
+                    "postal_code_suffix" -> {
+                        postcode.append("-").append(component.name)
+                    }
+                    "locality" -> binding.autocompleteCity.setText(component.name)
+                    "administrative_area_level_1" -> {
+                        binding.autocompleteState.setText(component.shortName)
+                    }
+                    "country" -> binding.autocompleteCountry.setText(component.name)
+                }
+            }
+        }
+        binding.autocompleteAddress1.setText(address1.toString())
+        binding.autocompletePostal.setText(postcode.toString())
+
+        // After filling the form with address components from the Autocomplete
+        // prediction, set cursor focus on the second address line to encourage
+        // entry of sub-premise information such as apartment, unit, or floor number.
+        binding.autocompleteAddress2.requestFocus()
+
+        // Add a map for visual confirmation of the address
+        showMap(place)
+    }
+
+    // [START maps_solutions_android_autocomplete_map_add]
+    private fun showMap(place: Place) {
+        coordinates = place.latLng as LatLng
+
+        // It isn't possible to set a fragment's id programmatically so we set a tag instead and
+        // search for it using that.
+        mapFragment =
+            supportFragmentManager.findFragmentByTag(MAP_FRAGMENT_TAG) as SupportMapFragment?
+
+        // We only create a fragment if it doesn't already exist.
+        if (mapFragment == null) {
+            mapPanel = (findViewById<View>(R.id.stub_map) as ViewStub).inflate()
+            val mapOptions = GoogleMapOptions()
+            mapOptions.mapToolbarEnabled(false)
+
+            // To programmatically add the map, we first create a SupportMapFragment.
+            mapFragment = SupportMapFragment.newInstance(mapOptions)
+
+            // Then we add it using a FragmentTransaction.
+            supportFragmentManager
+                .beginTransaction()
+                .add(
+                    R.id.confirmation_map,
+                    mapFragment!!,
+                    MAP_FRAGMENT_TAG
+                )
+                .commit()
+            mapFragment!!.getMapAsync(this)
+        } else {
+            updateMap(coordinates)
+        }
+    }
+    // [END maps_solutions_android_autocomplete_map_add]
+
+    private fun updateMap(latLng: LatLng) {
+        marker!!.position = latLng
+        map!!.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 15f))
+        if (mapPanel.visibility == View.GONE) {
+            mapPanel.visibility = View.VISIBLE
+        }
+    }
+
+    // [START maps_solutions_android_autocomplete_map_ready]
+    override fun onMapReady(googleMap: GoogleMap) {
+        map = googleMap
+        try {
+            // Customise the styling of the base map using a JSON object defined
+            // in a string resource.
+            val success = map!!.setMapStyle(
+                MapStyleOptions.loadRawResourceStyle(this, R.raw.style_json)
+            )
+            if (!success) {
+                Log.e(TAG, "Style parsing failed.")
+            }
+        } catch (e: NotFoundException) {
+            Log.e(TAG, "Can't find style. Error: ", e)
+        }
+        map!!.moveCamera(CameraUpdateFactory.newLatLngZoom(coordinates, 15f))
+        marker = map!!.addMarker(MarkerOptions().position(coordinates))
+    }
+    // [END maps_solutions_android_autocomplete_map_ready]
+
+    private fun clearForm() {
+        binding.autocompleteAddress1.setText("")
+        binding.autocompleteAddress2.text.clear()
+        binding.autocompleteCity.text.clear()
+        binding.autocompleteState.text.clear()
+        binding.autocompletePostal.text.clear()
+        binding.autocompleteCountry.text.clear()
+        mapPanel.visibility = View.GONE
+        binding.autocompleteAddress1.requestFocus()
+    }
+
+    // [START maps_solutions_android_permission_request]
+    // Register the permissions callback, which handles the user's response to the
+    // system permissions dialog. Save the return value, an instance of
+    // ActivityResultLauncher, as an instance variable.
+    private val requestPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted: Boolean ->
+        if (isGranted) {
+            // Since ACCESS_FINE_LOCATION is the only permission in this sample,
+            // run the location comparison task once permission is granted.
+            // Otherwise, check which permission is granted.
+            getAndCompareLocations()
+        } else {
+            // Fallback behavior if user denies permission
+            Log.d(TAG, "User denied permission")
+        }
+    }
+    // [END maps_solutions_android_permission_request]
+
+    companion object {
+        private val TAG = AutocompleteAddressActivity::class.java.simpleName
+        private const val MAP_FRAGMENT_TAG = "MAP"
+    }
+}
\ No newline at end of file
diff --git a/demo-kotlin/app/src/main/java/com/example/placesdemo/MainActivity.kt b/demo-kotlin/app/src/main/java/com/example/placesdemo/MainActivity.kt
index e38cef9d..fee2acd4 100644
--- a/demo-kotlin/app/src/main/java/com/example/placesdemo/MainActivity.kt
+++ b/demo-kotlin/app/src/main/java/com/example/placesdemo/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         setLaunchActivityClickListener(R.id.programmatic_autocomplete_button, ProgrammaticAutocompleteToolbarActivity::class.java)
+        setLaunchActivityClickListener(R.id.autocomplete_address_button, AutocompleteAddressActivity::class.java)
         setLaunchActivityClickListener(R.id.autocomplete_button, PlaceAutocompleteActivity::class.java)
         setLaunchActivityClickListener(R.id.place_and_photo_button, PlaceDetailsAndPhotosActivity::class.java)
         setLaunchActivityClickListener(R.id.current_place_button, CurrentPlaceActivity::class.java)
diff --git a/demo-kotlin/app/src/main/java/com/example/placesdemo/model/AutocompleteEditText.kt b/demo-kotlin/app/src/main/java/com/example/placesdemo/model/AutocompleteEditText.kt
new file mode 100644
index 00000000..4535f32c
--- /dev/null
+++ b/demo-kotlin/app/src/main/java/com/example/placesdemo/model/AutocompleteEditText.kt
@@ -0,0 +1,33 @@
+package com.example.placesdemo.model
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.appcompat.widget.AppCompatEditText
+
+class AutocompleteEditText : AppCompatEditText {
+    constructor(context: Context?) : super(context!!) {}
+    constructor(context: Context?, attrs: AttributeSet?) : super(
+        context!!, attrs
+    ) {
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        super.onTouchEvent(event)
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> return true
+            MotionEvent.ACTION_UP -> {
+                performClick()
+                return true
+            }
+        }
+        return false
+    }
+
+    // Because we call this from onTouchEvent, this code will be executed for both
+    // normal touch events and for when the system calls this using Accessibility
+    override fun performClick(): Boolean {
+        super.performClick()
+        return true
+    }
+}
\ No newline at end of file
diff --git a/demo-kotlin/app/src/main/res/layout/activity_main.xml b/demo-kotlin/app/src/main/res/layout/activity_main.xml
index 204cfeb6..b8650efb 100644
--- a/demo-kotlin/app/src/main/res/layout/activity_main.xml
+++ b/demo-kotlin/app/src/main/res/layout/activity_main.xml
@@ -31,6 +31,13 @@
     android:layout_margin="@dimen/spacing_small"
     android:text="@string/programmatic_autocomplete_geocoding"/>
 
+  <Button
+      android:id="@+id/autocomplete_address_button"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_margin="@dimen/spacing_small"
+      android:text="@string/autocomplete_address_button"/>
+
   <Button
       android:id="@+id/autocomplete_button"
       android:layout_width="wrap_content"
diff --git a/demo-kotlin/app/src/main/res/layout/autocomplete_address_activity.xml b/demo-kotlin/app/src/main/res/layout/autocomplete_address_activity.xml
new file mode 100644
index 00000000..782a9637
--- /dev/null
+++ b/demo-kotlin/app/src/main/res/layout/autocomplete_address_activity.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="@dimen/spacing_large"
+    tools:context=".AutocompleteAddressActivity">
+
+  <LinearLayout
+      android:id="@+id/autocomplete_scroll_container"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/autocomplete_address1_label"/>
+
+    <com.example.placesdemo.model.AutocompleteEditText
+        android:id="@+id/autocomplete_address1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:autofillHints=""
+        android:hint="@string/autocomplete_address1_label"
+        android:imeOptions="actionNext"
+        android:inputType="text"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/autocomplete_address2_label"/>
+
+    <EditText
+        android:id="@+id/autocomplete_address2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:autofillHints=""
+        android:hint="@string/autocomplete_address2_label"
+        android:imeOptions="actionNext"
+        android:inputType="text"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/autocomplete_city_label"/>
+
+    <EditText
+        android:id="@+id/autocomplete_city"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:autofillHints=""
+        android:hint="@string/autocomplete_city_label"
+        android:imeOptions="actionNext"
+        android:inputType="text"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:baselineAligned="false">
+
+      <LinearLayout
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="vertical">
+
+      <TextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/autocomplete_state_label"/>
+
+      <EditText
+          android:id="@+id/autocomplete_state"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:autofillHints=""
+          android:hint="@string/autocomplete_state_label"
+          android:imeOptions="actionNext"
+          android:inputType="textCapCharacters"/>
+
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/autocomplete_postal_label"/>
+
+      <EditText
+          android:id="@+id/autocomplete_postal"
+          android:layout_width="match_parent"
+          android:layout_height="0dp"
+          android:layout_weight="1"
+          android:autofillHints=""
+          android:hint="@string/autocomplete_postal_label"
+          android:imeOptions="actionNext"
+          android:inputType="number"/>
+      </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/autocomplete_country_label"/>
+
+    <EditText
+        android:id="@+id/autocomplete_country"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:autofillHints=""
+        android:hint="@string/autocomplete_country_label"
+        android:imeOptions="actionNext"
+        android:inputType="text"/>
+
+    <!-- Proximity check option provided for development testing convenience.
+     User would typically not control this option. -->
+    <CheckBox android:id="@+id/checkbox_proximity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/autocomplete_proximity_check"/>
+
+    <!-- The map for visual confirmation of the selected address -->
+    <!-- Stub to only load the map after Autocomplete prediction selection -->
+    <ViewStub
+        android:id="@+id/stub_map"
+        android:inflatedId="@+id/panel_map"
+        android:layout="@layout/autocomplete_address_map"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_gravity="bottom" />
+
+    <Button
+        android:id="@+id/autocomplete_save_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/autocomplete_save_button"/>
+
+    <!-- Reset button provided for development testing convenience. Not recommended for user-facing
+    forms due to risk of mis-click when aiming for Submit button. -->
+    <Button
+        android:id="@+id/autocomplete_reset_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:text="@string/autocomplete_reset_button"/>
+  </LinearLayout>
+</ScrollView>
+
diff --git a/demo-kotlin/app/src/main/res/layout/autocomplete_address_map.xml b/demo-kotlin/app/src/main/res/layout/autocomplete_address_map.xml
new file mode 100644
index 00000000..d69ec86f
--- /dev/null
+++ b/demo-kotlin/app/src/main/res/layout/autocomplete_address_map.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/map_panel_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/autocomplete_map_label"/>
+
+    <!-- A map will be added here programmatically
+    for visual confirmation of the selected address -->
+    <!-- [START maps_solutions_android_autocomplete_map_fragment] -->
+    <fragment xmlns:android="http://schemas.android.com/apk/res/android"
+        android:name="com.google.android.gms.maps.SupportMapFragment"
+        android:id="@+id/confirmation_map"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+    <!-- [END maps_solutions_android_autocomplete_map_fragment] -->
+
+</LinearLayout>
\ No newline at end of file
diff --git a/demo-kotlin/app/src/main/res/raw/style_json.json b/demo-kotlin/app/src/main/res/raw/style_json.json
new file mode 100644
index 00000000..5c756420
--- /dev/null
+++ b/demo-kotlin/app/src/main/res/raw/style_json.json
@@ -0,0 +1,20 @@
+[
+  {
+    "featureType": "poi",
+    "elementType": "all",
+    "stylers": [
+      {
+        "visibility": "off"
+      }
+    ]
+  },
+  {
+    "featureType": "transit",
+    "elementType": "labels.icon",
+    "stylers": [
+      {
+        "visibility": "off"
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/demo-kotlin/app/src/main/res/values/strings.xml b/demo-kotlin/app/src/main/res/values/strings.xml
index f2ab049a..5f0e6eb9 100644
--- a/demo-kotlin/app/src/main/res/values/strings.xml
+++ b/demo-kotlin/app/src/main/res/values/strings.xml
@@ -38,6 +38,9 @@
   <!-- Button for launching autocomplete test activity. -->
   <string name="autocomplete_button" translatable="false">Place Autocomplete</string>
 
+  <!-- Button for launching autocomplete address form activity. -->
+  <string name="autocomplete_address_button" translatable="false">Place Autocomplete Address Form</string>
+
   <!-- Button for launching place and photo test activity. -->
   <string name="place_and_photo_button" translatable="false">Place Details and Place Photos</string>
 
@@ -66,6 +69,37 @@
     </font>
   </string>
 
+  <!-- AUTOCOMPLETE ADDRESS -->
+
+  <!-- Label for the address form's first address line field. -->
+  <string name="autocomplete_address1_label" translatable="false">Address Line 1</string>
+
+  <!-- Label for the address form's second address line field. -->
+  <string name="autocomplete_address2_label" translatable="false">Apartment, unit, suite, or floor #</string>
+
+  <!-- Label for the address form's city field. -->
+  <string name="autocomplete_city_label" translatable="false">City</string>
+
+  <!-- Label for the address form's state field. -->
+  <string name="autocomplete_state_label" translatable="false">State/Province</string>
+
+  <!-- Label for the address form's postal code field. -->
+  <string name="autocomplete_postal_label" translatable="false">Postal code</string>
+
+  <!-- Label for the address form's country field. -->
+  <string name="autocomplete_country_label" translatable="false">Country/Region</string>
+
+  <!-- Label for the address form's proximity check setting. -->
+  <string name="autocomplete_proximity_check" translatable="false">Check device proximity</string>
+
+  <!-- Label for the address form's confirmation map. -->
+  <string name="autocomplete_map_label" translatable="false">Map view of the selected address</string>
+
+  <!-- Text for the address form submit button. -->
+  <string name="autocomplete_save_button" translatable="false">Submit address</string>
+
+  <!-- Text for the address form reset button. -->
+  <string name="autocomplete_reset_button" translatable="false">Clear form</string>
 
   <!-- KEEP UNTIL v3 REMOVED -->
 
@@ -146,6 +180,8 @@
   <!-- Text for the fetch place and photo button. -->
   <string name="fetch_place_and_photo_button" translatable="false">Fetch Place and Photo</string>
 
+  <!-- Text for the toast message for a skilled proximity match. -->
+  <string name="autocomplete_skipped_message" translatable="false">Address accepted without checking proximity</string>
 
   <!-- FIND CURRENT PLACE -->