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