Merge "Fix problem with wait_for_gdb."
am: d494665822

* commit 'd4946658225e7fdb12219924357814fcc0cd3cf9':
  Fix problem with wait_for_gdb.

Change-Id: If9ae01ddd02739cdb3ccbdde1b11c9ec8375fe7e