Merge "Trivial: group import statement in client.py"