Merge "Do not run apt-get update in spinup script"