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

Change-Id: I171542c4fd7ec40a588e5ae9e6d5cf601a77aeed