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

* commit 'eb56ad183af8a9833ff22a22b97f174f05266c58':
  extending timeout to stabilize tests