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

* commit '71d0183cd9b46877b981673f94fed1f5bf094cca':
  Fix NPE from feedback (issue 12106858)