Remove junk debugging

Change-Id: I7bcc4e8950d1dfc7d920e7c433e46caeaf7c039d
Merge "Remove junk debugging"