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

Change-Id: I9495eb03997b7759786f02d24b92657381053f2f