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

* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests