Improving logs

Change-Id: I75021b47851b3af946dc3a9b41a516934b4b2e3a
7 files changed