Use consistent timeouts for integration tests

Closes-Bug: #1281254
Change-Id: Ifc16709c68b059b0bf5e6872236970e012ee25bc
Merge "Use consistent timeouts for integration tests"