am 298784cd: Merge change 2420 into donut

Merge commit '298784cd8a7ed77923bdb51de38c15e4c246a037'

* commit '298784cd8a7ed77923bdb51de38c15e4c246a037':
  This just makes it easier to derive from ApplicationErrorReport.