Merge "Add methods to VirtualDeviceManagerInternal"