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

* commit '7be5f565e9b5a87c02db8c53e249fc4bf8dbbb02':
  Fix NPE we're seeing in feedback (issue 11626428)