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

Change-Id: Iddcdb96b6f471304336f548cf86fca1ad010cea8