Merge change 1545 into donut

* changes:
  Add Intent.ACTION_APP_ERROR