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

Change-Id: If34eb4b18325f4437f6f5d7df047e48c54c17aa9