am 96cd6714: Fix crash when connected to DDMS

* commit '96cd6714d94b47512710776761dec98c8be68bef':
  Fix crash when connected to DDMS