More debug stuff.

Change-Id: Ib651e596b2befff7b97d99dacef3eb413e537552