Increase default timeout

Bug: 19027813
Change-Id: I13af576dc3e980dc82e466435f41b322e2cd873e
2 files changed