Merge "Log: increase visibility of Log.TerribleFailure" am: 5e253647ad am: f6328d6943
am: 864dffcd81

Change-Id: I04838769ed83bd6b8283fbcb658ff89a4f92dee6