Merge "Increase timeouts." am: 9cb8e435eb
am: 8eb2316403

Change-Id: I8ead0a93856ced5a4e6fa7af2ea95acaa6b81cb7