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

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