fix for from six.moves import urllib - ImportError: cannot import name urllib

Change-Id: I26516d7d570ca166f40ed21b51f37dfdd0b95f21