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

* commit '19f7dcd5624536544f53a4e53fc1d62b96fdc11b':
  Fix NPE from feedback (issue 12106858)