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

Change-Id: I8e3f30633951111f4f77c56a8703d568bf802060