Increase timeouts for test suites

Change-Id: If7febf85d88c7133d4ae471f3d284293838891e4
Merge "Increase timeouts for test suites"