Bug 1337457: Use vm name to fill device-id

Change-Id: I56756428f6a45b9fe747917af6ceb6aa8a8d3029
Merge "Bug 1337457: Use vm name to fill device-id"