Merge "extending timeout to stabilize tests" into ics-mr1