Merge changes I57f70381,I9f225825

* changes:
  Fix cpplint issue.
  Fix crash when connected to DDMS