Merge "Fix debuggerd issues."