Merge "Reduce disk-image-builder env vars"