am b4bdef2b: am 96cd6714: Fix crash when connected to DDMS

* commit 'b4bdef2b104329145a7c668b142209e22eb8cc80':
  Fix crash when connected to DDMS