Merge "Base: Add INTERNAL_FATAL to logging severity" am: 88b5af68bd
am: 65a15765d0

Change-Id: I225fec9a41f4c890c0b54c8ee3735b331104ac8c