Merge "Resolve the tracked locations in profile saver"
am: 21b2bad9ce

Change-Id: I9ff55bf74e4116d4061d8731e9642a1ff1c5ad5b