Use the new extra to get the initial location.
am: fc72617ec6

Change-Id: Ica6d524e7c6358a556efa02c1614a63bab7145de