Merge "Fix debuggerd issues." into lmp-mr1-dev
automerge: b87e827

* commit 'b87e8276a5f59f39865536885486a364f60ec91e':
  Fix debuggerd issues.