Merge "extend timeout to allow for more time for the device to connect." into ics-mr1