Merge "Harden NsdManager against null-dereference crashes"
tree: 08cb6e9964661d625bf8582ba40c21058d94b3d3
  1. core/
  2. services/
  3. wifi/