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

* commit '75b64a1b64e788b9e69ac4f4cd8cce37932513a8':
  Fix the duplication in the debugging code.