Update or remove outdated urls

Change-Id: I4d138e55fdc34d8357b3fed9343c2442ce50ba69
Merge "Update or remove outdated urls"