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

Change-Id: I6ed4862b8b0b9ec4b8b1a015b5f8581b91ab4575