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

Change-Id: Ife38128988b7c788d20fd1cdd801066425df3e1a