Pull in logging improvements from master

Change-Id: I507095e988ccb03465480981f2488c55e16266d6