Make sure that a new location is "better" than the previous one.

Change-Id: I64fbd0c41f828cf82de92698be55420c642cbbf9