Fix NPE we're seeing in feedback (issue 11626428)

Change-Id: I848ca84b325339004ba8ea50a01f5240eea356f5
1 file changed