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