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

am skip reason: subject contains skip directive

Change-Id: I21063c1b113889ab4db26464a51f5c25f6612fb7