Merge "PreloadCheck: Reset UncaughtExceptionHandler" am: 73b25f4fcc
am: 5e84a4588e

Change-Id: I0a1e9392a9cbd18e8f10367577a8cd02ecbf71d4