[automerger skipped] RESTRICT AUTOMERGE Relax timeout for all operations am: fcba82540c -s ours am: dd7bee61d1 -s ours am: 40afddbbe2

Change-Id: Ib9564e844bdf1db6ec766b53958e67fb04def705