Merge "Fix problem with wait_for_gdb." into nyc-dev am: a7431cfa57
am: e423c24f74

* commit 'e423c24f74aaf0cb5d73a228d92ec4e4a56b0f4f':

Change-Id: I72a3ac70a7c54021dd919be81fde18df9f38b7bb