am 74f1b609: (-s ours) am 01a11148: (-s ours) am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread

* commit '74f1b609510c942b2e56b045a6685f5a6d53ccce':
  Port wi-fi stress test into GB DO NOT MERGE