Add debug information

Change-Id: Iba69a2418650fc4e921370a7c5f481e5a290c35a
Merge "Add debug information"