am ad999b60: Merge "Fix all debug directives."

* commit 'ad999b6062909d4922fb360a6f3b7f412cc06111':
  Fix all debug directives.