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

* commit 'c76bccd6ea993eb6e71baff9f5ed2f9fe67af947':
  Harden NsdManager against null-dereference crashes