Add more logging so that we have the info even in case of weird crashes.

Change-Id: I5888fb3e1ffa1bfdf9b91c06087ef5b7ccbb82ec