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

am skip reason: subject contains skip directive

Change-Id: Ia2a5bc564d0bbfb153459c960e46bfafddf13dc5