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

am skip reason: subject contains skip directive

Change-Id: I71833ed1e2d2541067d900ce4e461f44dfd7fda2