Add more info for debugging

Change-Id: I623a3c63eafb3583e5f6a1ae9bcefee68db10ad9
2 files changed