am eaa9ce70: am 606ab470: Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev

* commit 'eaa9ce7064ad4978d5acaafd4e797b5186ff03de':
  Improve exception error messages to help diagnose app errors