am cb14cd22: Merge "Add a test for our NPE checks." into lmp-mr1-dev

* commit 'cb14cd22a73936cb2d0660685762fd6e69707098':
  Add a test for our NPE checks.