Merge "Update strings for location" into pi-dev