Merge "Change Locate to Map for address selections" into pi-dev