am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev

* commit '98a027a506b5acff1a7ab0cc3655399da7d025c7':
  Harden NsdManager against null-dereference crashes