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