Merge "Merge "Change Locate to Map for address selections" into pi-dev am:...
Merge "Merge "Change Locate to Map for address selections" into pi-dev am: 03061a79" into pi-dev-plus-aosp
am: fbf46f69
Change-Id: I1ea9a28699c775f29e0ae6c8b419bab46e337dea