Merge "Fix problem with wait_for_gdb." am: d494665822 am: 9c02f2379f
am: 190786fff2

* commit '190786fff2fa8b78baebf046397d2eceef612dde':
  Fix problem with wait_for_gdb.

Change-Id: I1b1264a8149dc730e73d802ad403dce87db7f881