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

* commit '5f5ea91f60b4b7d2fcf3da3603cd745a53cba48f':
  extending timeout to stabilize tests