am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1

* commit 'bb69bde593bc0ba58c744b19c43619d4eb0866b7':
  extend timeout to allow for more time for the device to connect.