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

Change-Id: I6efaff87fef4acfedbd5c4601992130b153e4320