Merge "APM: Do not add null DeviceDescriptor to DeviceVector."