Merge "Reduce logging around segfaults" am: 9392718950 am: fd3ef922bb
am: 33ada14d34

Change-Id: I20458a1851dde622a211029f38abe74bf79f6f14