Merge "Add CreateEmptyDevice and WaitForDevice APIs"