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

Change-Id: I2259dfece96fc7de080ec751a5d7f5b7a52adb3b