Add/improve logging.

Change-Id: Ibdfe3d206350e12e5ad87b362e099dfc0a693685