am becc9148: am 8f5a1211: Merge "Add debug functions." into gingerbread

Merge commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62'

* commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62':
  Add debug functions.