Merge "Clean up error reporting." into qt-dev am: c355acd8ff
am: a5dcef6e4f

Change-Id: I63326e6d34c9e98153f70a8a4af5402a66920721