Merge "Get rid of httplib2, use urllib3 instead"