Merge "Harden NsdManager against null-dereference crashes"