Make the VDM install script more robust

Fix: 316525737
Test: manual
Change-Id: I3a5b08a9438bef8265cf81e9b905f96fc1e75fff
2 files changed