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

Change-Id: I6361cf9eb54eb1c9fbb0c4f49b913b4add870e97