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

* commit '6b0fb6137446a7972a3602057bf0c66c8a2dae5a':