Merge "Base: Explicitly set abort message on FATAL" am: 72050f715f am: c5413c2d3c
am: 2b34b3dffb

Change-Id: I15606756aae508a749ab02577546aa2147805b26