Improved debug output.
am: 98d558ea60

Change-Id: Iebbd268edd128409485d72a567c1398c4f7470ba