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

* commit '69a10949d62255f6b32dff8c3a6a91cbfcf98587':
  Fix NPE from feedback (issue 12106858)