Reduce number of curl downloads

Change-Id: Ie705a5b597165d368d82ed64aab3b0b6b487a29b