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

Change-Id: Ia62b8fea4337eb2742b315f1682d5830d068fc77