Add some debug logging

Change-Id: Idce1586174535abe05badc69b8f334dbc83c84c3