Merge "Increase timeout to avoid flaky tests."
am: a484817fc8

Change-Id: I57901a2505289fe69d3015fe8dbf383f9de3979e