Merge "Fix problem with wait_for_gdb." into nyc-dev am: a7431cfa57 am: 41e2838b38
am: ee709000aa

* commit 'ee709000aa65cf5175740206f4c7ef699fb81a47':
  Fix problem with wait_for_gdb.

Change-Id: I90963dbd45c11103cf110671f726e3b4b0a9979e