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

Change-Id: I4323a3eb62c0b5c489e24592fd811a7530e3d021