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

Change-Id: I2c8579a6f7b8cb636923703ce9551a51a095b19f