am 4002465f: am 7be5f565: am ab087b9f: Fix NPE we\'re seeing in feedback (issue 11626428)

* commit '4002465f5824b7f1b8bdf9927c71b2585ad2bdde':
  Fix NPE we're seeing in feedback (issue 11626428)