Merge "Increase timeouts."
am: 9cb8e435eb

Change-Id: I8bd9c12093d9db1529ba1c1efdc8e7204661b961