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

* commit '95f22023a70d4b8e2da908efdd85c2a6614f02b0':

Change-Id: I60ef85caddc4b765f00068886d6d1b7c8be02df5