Merge "Stop profiling on uncaught exception." am: 258a554f62
am: 2dc1fe659a

Change-Id: I10752fdb75026061ffbc82addaf7ed36cbfc359e