Add more logging

Change-Id: I6d70fe686f02add7400f50d12c2e0836a899b6c9