Merge "Resolve the tracked locations in profile saver"