Merge "Add additional test for likely NAT timeout" into froyo