Merge "Readability improvements in Logging" am: d51df736f6
am: 90b6e78657

Change-Id: I51e87f2a8146e1e60d3610bbdc791b40fc8ba972