am 65ff03a1: am 04b243d0: Fix NPE during ANRs.

Merge commit '65ff03a1fc56cd272529d1423ddef8e383cad7c0'

* commit '65ff03a1fc56cd272529d1423ddef8e383cad7c0':
  Fix NPE during ANRs.