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

Change-Id: I4d75c43cb475c6d2a2f61674f4a2dd762b4ddfa3