[automerger skipped] Increase timeouts. am: 3cd6902733 -s ours am: a686b5d633 -s ours
am skip reason: Change-Id Ia3c95dccc3076a3fd5ef6432097a57e4ccee4df3 with SHA-1 11555f0961 is in history

Change-Id: I79775d428ff26ade1f7e7837f64e079c07fb129a