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

Change-Id: I893b0a87751dcd7f4f5e7688a23e3604dd7a4534