Merge "Enable revert tests when possible, bump timeout"