Adds changes to allow for downloading or building images

Change-Id: If76b62ddd64f99a36d60d8c54bd46cb0e9ea7968