Merge \\"Revert \\"Temporarily increase timeout for devices with buggy driver\\"\\" into nyc-dev am: e36da9c8c9
am: 1810a68117

Change-Id: I7ad16d86185f507955ef9f29e6e9ce8e81e58bb3