Merge "Improve crasher."
am: dbfb20bda4

Change-Id: I77c00bef011d4c8ea5345012b72a8e808c5ab4d8