Merge "PreloadCheck: Reset UncaughtExceptionHandler"