Merge "large rework to optimize test code. removed lots of sleeps in favor of "Wait...
authorLuis Gomez <[email protected]>
Thu, 25 Sep 2014 05:13:41 +0000 (05:13 +0000)
committerGerrit Code Review <[email protected]>
Thu, 25 Sep 2014 05:13:41 +0000 (05:13 +0000)

Trivial merge