Improved logging.

Change-Id: I8de034d590da51033dfa308078b8855731eec155