(no-ticket) Better log formatting.

Change-Id: I044253051ecf1840fd15752c57c1ddf769c56f64
Merge "(no-ticket) Better log formatting."