Merge "Improve crasher." am: dbfb20bda4 am: b7ceb2397e
am: ced63cee3c

Change-Id: Iadb7940755bca93f26873e64f35e67b76bb09487