am 21a9e3d0: am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev
* commit '21a9e3d022728915da10342efbb9b95866d86ae7': Harden NsdManager against null-dereference crashes
This commit is contained in: