am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1

* commit '3ded587cc199d4ba592e675dc47fb80a28d1dacd':