Merge "Increase ping timeout on scenario testing"