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

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