Merge "Unskip and Add timeout method to dns check scenario"