Fix logging issues.

Change-Id: If5c256ae18046eb8092ed262140742598da4c4b0