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

Change-Id: I442bcdfc4664d41638ae95ef0bd0098f4111c301