am ca483765: Merge "Fix the duplication in the debugging code."

* commit 'ca483765bd0dc16294b9e67dd0de5c6d53b1bfa3':
  Fix the duplication in the debugging code.