am cb0468fa: am b79a48c2: Merge "Add logging for NPE (issue 11627249)" into jb-ub-now-jolly-elf

* commit 'cb0468facb5a2a3927701b329f5f7e3309bb8fc3':
  Add logging for NPE (issue 11627249)