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

* commit '41e2838b38dd1cd87a4b963c58c83e35ed87d26b':
  Fix problem with wait_for_gdb.

Change-Id: Ie89c368b36df53dba3133cfccc1d79ed883d6e0b