Merge "Small liblog test fixes & readability improvements." am: 332370d14d am: 511cc67633 am: 32636f0f4c
am: e751059975

Change-Id: I42aec84c5f78fd256a5bfe523d20752fcff7874d