Merge \"Fix flaky discoverable stress test.\" into nyc-mr1-dev
am: 9e67da47f3

Change-Id: I5583238b6de24571762c656253510b469cd810f1