am 28e9f76d: am c76bccd6: am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev

* commit '28e9f76dcefb53a493fed74b0ccaac650755f069':
  Harden NsdManager against null-dereference crashes