Fix diskimage-builder cherry-pick

Forgot to commit this before I pushed.