Merge "Fix logging output" am: 61faad8bb1
am: 61e85dfbba

Change-Id: I31a0f9e26430ca116342d3f73e3bc9f5d4ccb125