Add debug messages for testing.

Change-Id: I9f03a2281e5dea04e45fec61fbdb1120f0a32ef0
WIP

Change-Id: I96f1d8ae56c0b71301469177c15b1d09556e447a