Merge "Fix the VirtualDeviceManagerServiceTest tests."