Merge "Increase test timeouts"
am: d53208c8e7

* commit 'd53208c8e7ca4b2e2d4070d8e67ec1ee078cee74':
  Increase test timeouts

Change-Id: Ic1082f39b07b2a093b861d9012fdf542a2f795d0