am a68b478f: Merge changes I57f70381,I9f225825

* commit 'a68b478fbc6ca8d445a3befc7eb8ca58586294eb':
  Fix cpplint issue.
  Fix crash when connected to DDMS