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

* commit '243c3b0f921e608efbf507ccbea97d07a091f8af':