Improve logging

Change-Id: I9c879cc16de0d5353a5ab8ce4c8a8cd7f000a170