am c5022b54: am 71d0183c: am 19f7dcd5: am 69a10949: Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit

* commit 'c5022b54272485938f2ca9d15a09627119435b6d':