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

* commit '4cd5703b9eef30a32271819503808576666e1601':
  Fix the duplication in the debugging code.