Merge "Fix problem with wait_for_gdb." into nyc-dev