Merge "Fix logging output"
am: 61faad8bb1

Change-Id: I6e916ff4c43ce319e494cca7c819c7436c3a3d13