Merge "Reland "fdsan: make fatal by default."" am: 28cf07f93d am: bfa725b254
am: 87dd935498

Change-Id: I2726b453f252f3c2c8cf17874fddf13434cc0448