Use the new extra to get the initial location.

Also fix some bugs around that and add respective tests.

Bug: 32648422

Change-Id: I9bba32979c7dda4edc7a694efd0ae5b9f272dcc7
4 files changed