Merge "Reduce logging around segfaults"
am: 9392718950

Change-Id: Ib1f06d3e4ff696aa56426719eb50bd7ed4e61094