Adding some additional logging

Change-Id: I27621c19fcfcce46882cd438f8a8fc80408f5748