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

Change-Id: I5483919d199ab334717c353d3d4a4da2cda5dbe5