Merge "Extend ExpensiveObjectsPerfTest timeouts."