Use six.moves.urllib.parse instead of urllib Change-Id: I9c563e0e54f52b0b26919fd0bd2d31dc8873d8fd Closes-bug: #1280105