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

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