Work out networking for use with virtualbox + deployment

Change-Id: I3009764bdba9a9f19f334efb6b2b671eecaf8a13