Improve logging

Change-Id: Ia855b1a45a3abbc1a87233462f19b330b72d30b9
2 files changed