Merge "Use the new extra to get the initial location." into nyc-andromeda-dev