Fix debug logging am: e661419d17
am: 62d7aeff56

Change-Id: I8bdf267af437cfe76db2761f0664e19902a8824b