Merge "Fix dns problem on E/// pod"