Align our setup.py with ourselves

Change-Id: I4f17be5ba752cfb8ffdf62e1498d1c72b0d3962a
Merge "Align our setup.py with ourselves"