am 20339b24: Merge "Remove Debug Code"

* commit '20339b24394be06c5bfe5157a4b35adc48f665eb':
  Remove Debug Code