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

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