Merge "Fix debug output."
am: d2013b4478

Change-Id: I3276299493a7acde38880a27014eadc0e3e3a899