This doesn't necessarily fix the bug, but I think the problem was that the device IDs were in upper case but we store them statically in lower case, all the while using case-sensitive comparators. This patch switches all comparators that I could find to use case-insensitive instead, hopefully solving this.