Merge "Rename instrumentation ExceptionCaught to ExceptionThrown"