Merge "Fix debuggerd issues." into lmp-mr1-dev