Merge "Fix debug output." am: d2013b4478 am: cad30d34e0
am: 59e43277ac

Change-Id: I8c0d17dacc57bbb676d970ce78f73bf0e5c5fd98