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

Change-Id: Ic2a03399b6a0e8ae455d75ce134a2bb276e01c37