am d02344c9: am 70c1fb87: (-s ours) am 0473a1ea: am b6deb331: Merge "New property that determines when to wait for gdb."

* commit 'd02344c940486a41b9320de9a19fbabd81ced7b7':