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

Change-Id: I7eba86dfbf8845aae8bafddc4a6bc5f94b66bc2b