Merge "[Updater] Prefer url similar to previous one" am: 70480f5af1 am: 4d76d7ffa5 am: 6feb1c55ec
am: 9039848a6a

Change-Id: Iac30c47a9b8afa0a0bdb4b75265a75c951f8d5dc