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

* commit '8885596a9109794ebd61e6a91e5199aa1750ed8c':