am 81d03521: Merge "Clean up debugger"

* commit '81d035213b0426ee076cc0d017c895c7833d32e8':
  Clean up debugger