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