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

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