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

Change-Id: I2cade2eaed7858c802ceccb259369d2f34fd0c49