Merge "Keep py3.X compatibility for urllib"