Merge "Fix debug output."
am: 1246f1fb65

Change-Id: Ifb20c4e08c91499cb6f4dc729c8b00db1f895fd4