am cd01ad7c: am 20339b24: Merge "Remove Debug Code"

* commit 'cd01ad7cc7813e3067826945c2a472602f1d3509':
  Remove Debug Code